1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Commit Graph

2309 Commits

Author SHA1 Message Date
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
David Bomba
4bcf8c1922 date formatting products 2015-12-28 20:14:21 +11:00
Hillel Coren
9943c824dd Bug fixes 2015-12-27 14:45:57 +02:00
Hillel Coren
8d61925e06 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-27 13:38:01 +02:00
Hillel Coren
6f2c3c76a3 Bug fixes 2015-12-27 13:37:54 +02:00
Hillel Coren
4904cfe169 Merge pull request #571 from turbo124/master
API - get request for all user accounts
2015-12-27 13:37:20 +02:00
David Bomba
5b87821774 Merge remote-tracking branch 'upstream/master' 2015-12-27 22:34:16 +11:00
Hillel Coren
c493f6e49a Working on the API 2015-12-27 13:08:58 +02:00
Hillel Coren
ddd5915ca1 git update 2015-12-27 09:36:22 +02:00
David Bomba
5a03b923db Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2015-12-25 11:16:11 +11:00
Hillel Coren
991b19b2a2 Bug fixes 2015-12-24 13:17:11 +02:00
Hillel Coren
c0409b86fd Added custom labels to email variables 2015-12-23 16:21:48 +02:00
Hillel Coren
3f1891fa3b Bug fixes 2015-12-23 13:49:49 +02:00
Hillel Coren
9341ea0c87 Bug fixes 2015-12-22 14:06:53 +02:00
David Bomba
d044cffa44 Merge remote-tracking branch 'upstream/master' 2015-12-22 22:19:43 +11:00
David Bomba
087b60a503 additional GET for user_accounts 2015-12-22 22:19:21 +11:00
Hillel Coren
8739a1b46b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-21 21:58:02 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
David Bomba
428c1590e4 Merge pull request #570 from turbo124/master
Tax Rate Transformer added
2015-12-21 18:37:29 +11:00
David Bomba
68ee5d04a4 Tax Rate Transformer added 2015-12-21 18:36:29 +11:00
David Bomba
98ee6594ac Merge pull request #569 from turbo124/master
Working on API Transformers
2015-12-20 08:31:15 +11:00
David Bomba
083e995e2b Working on API Transformers 2015-12-20 08:30:06 +11:00
David Bomba
ec3d34cacf Merge pull request #568 from turbo124/master
Added currency_id to Client transformer
2015-12-18 19:34:41 +11:00
David Bomba
79bef21e82 Added currency_id to client transformer 2015-12-18 19:33:14 +11:00