David Bomba
34f63cdbb3
Merge pull request #602 from turbo124/master
...
Integrate Payments into API
2016-01-05 23:53:33 +11:00
David Bomba
f66539b0da
Integrate Payments into API
2016-01-05 23:51:27 +11:00
steenrabol
d3ee8ed813
Expense module
2016-01-05 12:47:03 +01:00
Hillel Coren
cd2599fe58
Fix for #597
2016-01-04 00:02:13 +02:00
Hillel Coren
0140da0ae2
Renamed client view to client portal
2016-01-03 21:10:20 +02:00
Hillel Coren
56330c1281
Merge pull request #588 from joshuadwire/custom-css
...
Add custom CSS support
2016-01-03 14:45:16 +02:00
Hillel Coren
af7225c05b
Added XCD currency
2016-01-02 22:53:04 +02:00
Hillel Coren
598a112101
Fixes #595
2016-01-02 22:37:45 +02:00
Hillel Coren
768c7202b5
Merge pull request #593 from hannenijhuis/master
...
Bug fix typo in TaskController
2016-01-02 21:13:33 +02:00
Joshua Dwire
103bce3f48
Make recurring invoice due date settings more translatable
2016-01-01 17:37:47 -05:00
Joshua Dwire
21888f6bca
Move invoice sent last, send next, due next stats to third column
2016-01-01 17:37:25 -05:00
Joshua Dwire
2eecccad77
Move translation texts to end of file
2016-01-01 15:52:36 -05:00
hanne@hannenijhuis.nl
e460f154a5
Bug fix typo in TaskController
2016-01-01 15:32:09 +01:00
Hillel Coren
139088086f
Fixed problem with empty fields in CSV import
2016-01-01 10:34:32 +02:00
Joshua Dwire
7e336ec118
Add due date settings for recurring invoices
...
* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text
2015-12-31 23:59:02 -05:00
Hillel Coren
06c1534093
Added getString helper to CSV import
2015-12-31 17:09:45 +02:00
Hillel Coren
db2e37d31b
Hide payments file for non-Wave imports
2015-12-31 16:33:29 +02:00
Hillel Coren
2144870b96
Removed getInvoiceId from non-Wave transformers
2015-12-31 16:14:30 +02:00
Hillel Coren
fa3f812194
Merge pull request #592 from invoiceninja/revert-591-revert-590-revert-589-revert-586-wave-invoice-import
...
Re-revert "Improve Import Support"
2015-12-31 16:11:59 +02:00
Hillel Coren
e5ca3973d8
Revert "Revert "Re-revert "Improve Import Support""""
2015-12-31 16:11:44 +02:00
Hillel Coren
810d18981b
Merge pull request #591 from invoiceninja/revert-590-revert-589-revert-586-wave-invoice-import
...
Revert "Re-revert "Improve Import Support"""
2015-12-31 15:37:01 +02:00
Hillel Coren
f5530a30b2
Revert "Re-revert "Improve Import Support"""
2015-12-31 15:36:53 +02:00
Hillel Coren
4c4315c836
Merge pull request #590 from invoiceninja/revert-589-revert-586-wave-invoice-import
...
Re-revert "Improve Import Support""
2015-12-31 15:06:51 +02:00
Hillel Coren
e60c52e93c
Revert "Revert "Improve Import Support""
2015-12-31 15:06:30 +02:00
Hillel Coren
046b34ed70
Merge pull request #589 from invoiceninja/revert-586-wave-invoice-import
...
Revert "Improve Import Support"
2015-12-31 13:47:06 +02:00
Hillel Coren
fc0313bade
Revert "Improve Import Support"
2015-12-31 13:46:56 +02:00
Hillel Coren
7e325662bf
Merge pull request #586 from joshuadwire/wave-invoice-import
...
Improve Import Support
2015-12-31 13:39:54 +02:00
Hillel Coren
debc22d7d2
Bug fixes
2015-12-31 13:31:50 +02:00
Hillel Coren
35bb36fd34
Bug fixes
2015-12-31 12:23:39 +02:00
Hillel Coren
c2c51360dd
Fixes for #584
2015-12-31 10:04:12 +02:00
Joshua Dwire
f69ae9155b
Add me as contributor
2015-12-30 23:47:09 -05:00
Joshua Dwire
cc6670b3f7
Added new libraries
2015-12-30 23:46:00 -05:00
Hillel Coren
565b26ba27
Bug fixes
2015-12-30 20:45:52 +02:00
Joshua Dwire
b7687967a6
Add custom CSS support
...
* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text
2015-12-30 13:11:51 -05:00
Joshua Dwire
6af5084e0a
Finish import changes
2015-12-30 09:42:41 -05:00
Joshua Dwire
5932a837dd
Improve Import Support
...
* Add support for payment imports
* Add support for Wave Invoice import
* Add ability to merge invoice line items into a single invoice
2015-12-30 00:14:14 -05:00
Hillel Coren
dbf2ec5e13
Bug fixes
2015-12-29 23:55:35 +02:00
Hillel Coren
eb450365d6
Bug fixes
2015-12-29 21:05:08 +02:00
Hillel Coren
60daef8d58
Bug fixes
2015-12-29 19:49:40 +02:00
Hillel Coren
bb04eba0fe
Updated libraries
2015-12-29 13:54:47 +02:00
Hillel Coren
6d6f8f5cab
Fix for dev channel Chrome crash
2015-12-29 12:23:50 +02:00
Hillel Coren
15ec7ce5b5
Merge branch 'master' of github.com:hillelcoren/invoice-ninja
2015-12-29 09:52:09 +02:00
Hillel Coren
898e31c8b5
Fix for dev channel Chrome crash
2015-12-29 09:52:02 +02:00
Hillel Coren
9e2ca24093
Merge pull request #579 from nerdoc/patch-14
...
ignore composer c3.php file
2015-12-29 09:37:29 +02:00
Christian González
c04d2a3047
ignore composer c3.php file
...
This file is created every time "composer install" is run
2015-12-29 01:31:02 +01:00
Hillel Coren
89fe2bf356
Merge pull request #574 from nerdoc/patch-14
...
removed German "Deppenleerzeichen"
2015-12-28 22:35:14 +02:00
Christian González
966ff02ffd
removed German "Deppenleerzeichen"
2015-12-28 21:28:15 +01:00
Hillel Coren
d1de95303b
Merge branch 'master' of github.com:hillelcoren/invoice-ninja
2015-12-28 12:16:03 +02:00
Hillel Coren
2ead34fef0
Enabled setting reminder before/after due date or invoice date
2015-12-28 12:15:56 +02:00
David Bomba
d5c83fdcd1
Merge pull request #572 from turbo124/master
...
date formatting products
2015-12-28 20:15:16 +11:00
