1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Commit Graph

1278 Commits

Author SHA1 Message Date
James
30c974c255 Merge pull request #1 from hillelcoren/master
Update from master
2015-06-10 08:17:05 +12:00
Hillel Coren
1b39da734a Update readme 2015-06-09 15:48:19 +03:00
Hillel Coren
0ebd503899 Minor bug fixes 2015-06-07 11:43:34 +03:00
Hillel Coren
77c90ad21f Bug fixes 2015-06-07 11:05:30 +03:00
Hillel Coren
b80842759e Bug fixes 2015-06-04 23:53:58 +03:00
Hillel Coren
060a14736b Added support for Dwolla 2015-06-03 20:55:48 +03:00
Hillel Coren
2e39bfaba1 Merge pull request #337 from searsaw/patch-1
New account gateways not saving
2015-06-01 23:10:54 +03:00
Alex Sears
59f5d60207 New account gateways not saving
Noticed a bug when setting up things locally.  This prevented new account gateways from being saved in the DB.
2015-06-01 16:07:37 -04:00
Hillel Coren
1f28cc2106 Bug fixes 2015-06-01 17:34:29 +03:00
Hillel Coren
c902552d5f Bug fixes 2015-06-01 17:34:00 +03:00
Hillel Coren
02b7ca64e8 Update version 2015-06-01 16:08:38 +03:00
Hillel Coren
74787804e7 Minor tweaks 2015-06-01 16:06:18 +03:00
Hillel Coren
c419f5dab9 Merge pull request #333 from bcole808/fix-invoice-design-page-error
Fixed template error on Advanced Settings / Invoice Design
2015-05-31 22:09:26 +03:00
Hillel Coren
eb572d9021 Fixed problem with invoice design page 2015-05-31 21:45:39 +03:00
Hillel Coren
ed189fcc23 Fixed label formatting 2015-05-31 21:19:45 +03:00
Hillel Coren
69cd370744 Set default mail from address 2015-05-31 20:24:56 +03:00
Hillel Coren
50d720b640 Updated composer and fixed former config 2015-05-31 15:51:49 +03:00
Hillel Coren
1a8245dcff Adding support for Dwolla 2015-05-31 15:37:29 +03:00
Ben Cole
3014a22849 Wrap @foreach in conditional
If $invoiceLabels was not set, an invalid argument error was being
thrown on the page “/company/advanced_settings/invoice_design”
2015-05-29 10:57:03 -07:00
Hillel Coren
9ffcf9f3ef Updating version 2015-05-27 23:37:39 +03:00
Hillel Coren
976773ce7b Enabled setting custom invoice item labels 2015-05-27 23:20:35 +03:00
Hillel Coren
57b5db4ed8 Merge pull request #329 from Lykegenes/Lykegenes-sqlite-patch-1
SQLite compatibility
2015-05-27 21:47:42 +03:00
Patrick Samson
c60831f7f4 Fix constraint violations in SQLite 2015-05-27 13:45:50 -04:00
Patrick Samson
2717298e56 fixed ambiguous column name in SQLite 2015-05-27 13:29:52 -04:00
Patrick Samson
d4df8747f7 fixed ambiguous column name in SQLite 2015-05-27 13:27:29 -04:00
Hillel Coren
3b90030059 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-27 19:52:14 +03:00
Hillel Coren
3da1e738d8 Working on tasks 2015-05-27 19:52:10 +03:00
Hillel Coren
e4a45c6cf9 Merge pull request #326 from bcole808/whitelabel-fix
Public payment page white label issue
2015-05-27 09:20:34 +03:00
Ben Cole
e054c4d9e4 Hide logo on public payment page if white label 2015-05-26 21:40:53 -07:00
Hillel Coren
607140327d Merge pull request #323 from bcole808/issue-320-email-preview
Added missing template variable to live preview; closes #320
2015-05-26 22:06:50 +03:00
Ben Cole
e9bf76a2d9 Added missing template variable to live preview; closes #320 2015-05-26 10:41:40 -07:00
Hillel Coren
50e3008ebb Merge #319 2015-05-22 13:52:49 +03:00
Hillel Coren
d8e2aacece Merge pull request #316 from paralin/master
Add dependencies to enable mandrill mail
2015-05-22 10:33:36 +03:00
Hillel Coren
7bc95f0381 Merge pull request #318 from hillelcoren/revert-317-master
Revert "Composer update for HTML/Form Facade"
2015-05-22 10:31:32 +03:00
Hillel Coren
557323d761 Revert "Composer update for HTML/Form Facade" 2015-05-22 10:30:04 +03:00
Hillel Coren
5eeca49771 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-22 10:22:29 +03:00
Hillel Coren
33d139adf5 Working on pdfmake 2015-05-22 10:22:24 +03:00
Hillel Coren
4512b05f85 Merge pull request #317 from infacq/master
Composer update for HTML/Form Facade
2015-05-22 10:21:00 +03:00
Infacq
9f388c7a10 fix comma 2015-05-22 15:11:54 +08:00
Infacq
6bf806450c change to blade style for CSRF 2015-05-22 15:10:55 +08:00
Infacq
4284ab6f91 to suit with Laravel Collective Syntax 2015-05-22 15:09:14 +08:00
Infacq
e40c634ea8 change to official community project 2015-05-22 15:06:34 +08:00
Christian Stewart
ed283b9bad Merge branch 'master' of github.com:paralin/invoice-ninja 2015-05-21 16:59:01 -07:00
Christian Stewart
6bf47bdb17 Add guzzle for mandrill support
Conflicts:
	composer.lock
2015-05-21 16:58:25 -07:00
Hillel Coren
0ffd13f864 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-19 22:14:24 +03:00
Hillel Coren
edec5028c6 Bug fixes 2015-05-19 22:14:00 +03:00
Hillel Coren
8b8117e539 Merge pull request #309 from jpgnz/mail_from_address
Sending Email from AWS/Mandrill/Generic SMTP Services: Fix RFC Error
2015-05-15 14:13:32 +03:00
James Graham
ba1231357a Fix RFC Error
When using AWS/Mandrill etc, using MAIL_USERNAME as the "From Address"
causes errors. Need to create new .env variable.
2015-05-15 21:15:22 +12:00
Hillel Coren
935780f7bc Bug fixes 2015-05-15 11:51:22 +03:00
Hillel Coren
19c1a33d52 Bug fixes 2015-05-13 18:32:59 +03:00