Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity
2,690 Commits 7 Branches 917 Tags 2 GiB
39f426e352
Commit Graph

1682 Commits

Author SHA1 Message Date
David Bomba
6d09bda646 Working on API functionality 2016-02-17 21:16:13 +11:00
David Bomba
aef4658873 Api work/Bug fixes 2016-02-17 19:10:33 +11:00
David Bomba
a6e9c5198d Bug fixes 2016-02-17 14:46:28 +11:00
David Bomba
9428557e70 Bug Fixes 2016-02-17 14:43:25 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
e3ee79f369 Improving error reporting API 2016-02-17 10:44:01 +11:00
David Bomba
7da522599c Improving error reporting API 2016-02-17 10:36:45 +11:00
David Bomba
7cd3bac29c Improving error reporting API 2016-02-17 10:35:54 +11:00
David Bomba
1a953c5bcb Improving error reporting API 2016-02-17 10:34:23 +11:00
David Bomba
3e4df4ff4f Improving error reporting API 2016-02-17 10:29:18 +11:00
David Bomba
09650123d7 Improving error reporting API 2016-02-17 10:05:08 +11:00
David Bomba
a1be1f3529 Improving error reporting API 2016-02-17 09:45:28 +11:00
David Bomba
1fde9261e6 Improving error reporting API 2016-02-17 09:38:23 +11:00
David Bomba
170ee5a40b Improving error reporting API 2016-02-17 09:28:00 +11:00
David Bomba
31720b59fd Improving error reporting API 2016-02-17 09:12:34 +11:00
David Bomba
746b6ef362 Improving error reporting API 2016-02-17 09:09:32 +11:00
Hillel Coren
2295102b98 Adding back change from conflict 2016-02-17 00:07:05 +02:00
Hillel Coren
8735409753 Merge branch 'release-2.5.0.2' 
Conflicts:
	app/Http/Controllers/ClientApiController.php
 2016-02-17 00:03:23 +02:00
Hillel Coren
c9f58ce2d3 Bumped version number to 2.5.0.2 2016-02-16 23:59:24 +02:00
David Bomba
4a033ce925 Improving error reporting API 2016-02-17 08:57:06 +11:00
David Bomba
1ab4bb636f Improving error reporting API 2016-02-17 08:48:10 +11:00
Hillel Coren
81f08cdd17 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-16 17:30:30 +02:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
David Bomba
3c2b0ba45d Error handling 2016-02-16 10:30:28 +11:00
David Bomba
cacc24ede4 Merge pull request #722 from turbo124/api_errors 
Improve error handling in API
 2016-02-16 10:28:31 +11:00
Hillel Coren
0ea8461706 Fixed problem with search when using foreign language 2016-02-15 20:15:45 +02:00
Hillel Coren
7c3406d9e5 Fix for #703 2016-02-15 19:58:18 +02:00
Hillel Coren
3520c0fa79 Added custom invoice text fields to transformer 2016-02-15 19:39:26 +02:00
David Bomba
a295120015 Client API Error handling 2016-02-15 21:57:58 +11:00
David Bomba
f8fee3e8cd Error handling for API 2016-02-15 21:24:06 +11:00
Hillel Coren
907ab8f0e8 Bumped version number to 2.5.0.1 2016-02-14 23:23:01 +02:00
Hillel Coren
cf4eeb8594 Updated version 2016-02-11 21:48:05 +02:00
Hillel Coren
2b5167c266 Fixed issue when updating from previous version 2016-02-11 21:37:39 +02:00
Hillel Coren
b5f817cf14 Changed future white-label licenses to one year 2016-02-11 21:27:58 +02:00
Hillel Coren
d1dd02644b Added 'overdue' status to invoice list 2016-02-11 21:12:50 +02:00
Hillel Coren
0a2a97d89a Fixed an API issue when only setting product_key in an invoice 2016-02-11 19:24:41 +02:00
Hillel Coren
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
David Bomba
a8cff1db95 Jump over duplicate checks if request comes from API 2016-02-10 13:05:32 +11:00
David Bomba
498d7cbca9 Revert "Table locking for public_id integrity" 2016-02-10 12:32:12 +11:00
David Bomba
67b74b2a34 Table locking for public_id integrity 2016-02-10 11:26:21 +11:00
David Bomba
04807bccc6 Merge pull request #708 from turbo124/master 
Validation rule realignment
 2016-02-10 08:51:43 +11:00
David Bomba
3878fe9324 Validation rule realignment 2016-02-10 08:51:08 +11:00
ridgarou
60530d3cbc Update AccountRepository.php 2016-02-09 12:37:23 +01:00
David Bomba
ce58c581ef Delete Client from API 2016-02-08 15:27:42 +11:00
David Bomba
d401a6fb93 Bug in Client API not paginating all results 2016-02-08 10:37:38 +11:00
David Bomba
391d721180 Bug fixes 2016-02-07 22:30:36 +11:00
David Bomba
ccaabe2926 working on payments API 2016-02-07 22:01:39 +11:00
David Bomba
42f3cffca8 Delete a payment from the API 2016-02-07 21:24:21 +11:00
David Bomba
b3346011bc api bug fixes 2016-02-07 20:20:38 +11:00
David Bomba
7d2f635272 testing payment api 2016-02-07 19:39:51 +11:00
David Bomba
0c251392eb testing payment api 2016-02-07 19:32:43 +11:00
David Bomba
95e1baed29 testing payment api 2016-02-07 19:30:47 +11:00
David Bomba
138749ce6f update payment from API 2016-02-06 14:42:21 +11:00
Hillel Coren
e619bacf66 Fix for renewel logic 2016-02-04 22:50:30 +02:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +02:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
Hillel Coren
5f709f76a8 Bug fix: notification emails have the wrong entity type 2016-02-03 22:53:18 +02:00
Hillel Coren
0ce9e426d9 Hid 'test email' button until issue updating connection info is resolved 2016-02-03 22:45:39 +02:00
Hillel Coren
25b8c54355 Bug: fix 'Invoice issued to' in business design for quote 2016-02-03 22:19:15 +02:00
Hillel Coren
cc49415a78 Added invoiceDate as email template variable 2016-02-03 22:10:09 +02:00
Hillel Coren
a584973eea Adding https suggestion 2016-02-03 20:59:07 +02:00
Hillel Coren
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
021f195c45 Implemented UpdateAccountRequest 2016-02-03 14:41:40 +02:00
David Bomba
80d800fd36 Merge pull request #686 from turbo124/master 
Added Payments to API
 2016-02-03 21:08:34 +11:00
David Bomba
2c8d3e2013 Added Payments to API 2016-02-03 21:06:49 +11:00
Hillel Coren
86b6d9dc10 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-03 10:08:35 +02:00
Hillel Coren
37ffd01463 Filtered out quotes from reminder emails 2016-02-03 10:08:12 +02:00
Hillel Coren
65d3667600 Increased timeout when installing/updating 2016-02-03 10:07:44 +02:00
David Bomba
ead2b335d5 Added Credit Transformer 2016-02-03 14:21:13 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
1a2c2712d0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-01 15:58:59 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
David Bomba
f90adb27e3 Merge pull request #678 from turbo124/master 
Update account from API
 2016-02-01 14:44:29 +11:00
David Bomba
c0545be0d4 update account from API 2016-02-01 14:42:05 +11:00
David Bomba
eef8ad22d0 Merge pull request #677 from turbo124/master 
Archive Product via API
 2016-02-01 13:33:27 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
David Bomba
9e1a7eb632 Merge pull request #676 from turbo124/master 
Remove redundant emailInvoice method
 2016-02-01 09:46:07 +11:00
David Bomba
f48ac1b6f0 remove redundant method 2016-02-01 09:45:15 +11:00
Hillel Coren
63c1293e3b Add Header/Footer options to invoice design settings 2016-01-31 23:55:02 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +02:00
Hillel Coren
63eda63d9f Fix for #672 2016-01-31 17:39:31 +02:00
Hillel Coren
646c239cd8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 15:10:40 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
David Bomba
204748ad33 Working on products api 2016-01-30 22:29:22 +11:00
David Bomba
63894e0f24 Working on products api 2016-01-30 22:27:26 +11:00
David Bomba
b93cd84052 Working on products api 2016-01-30 22:20:09 +11:00
David Bomba
32ed23cde7 Working on products api 2016-01-30 22:18:30 +11:00
David Bomba
43c6024f0f Working on products api 2016-01-30 22:17:10 +11:00
David Bomba
1f36e175dd Working on products api 2016-01-30 22:16:25 +11:00
David Bomba
1e8a4c2b70 Working on products api 2016-01-30 21:51:52 +11:00
David Bomba
1da8f6bc26 bug fixes 2016-01-30 20:57:47 +11:00
David Bomba
cc40f51f84 working on product API 2016-01-30 20:56:27 +11:00
David Bomba
020e428677 testing email functionality: 2016-01-29 12:47:35 +11:00
David Bomba
32acb8b86a Add send_invoice boolean in contact transformer 2016-01-29 10:08:11 +11:00
Hillel Coren
e245b6f639 Updated texts file 2016-01-28 16:34:22 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
9d3d58def1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-28 14:05:01 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
David Bomba
cae3b48cd4 Restore Invoice from API 2016-01-28 13:31:19 +11:00
David Bomba
165a382637 Restore an invoice from the API 2016-01-28 12:55:15 +11:00
David Bomba
8d6b4af8ba Added quote_invoice_id to Invoice transformer 2016-01-28 09:19:54 +11:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
a7f2d3354c Resolved issue with expenses and multi-tenancy 2016-01-27 20:31:08 +02:00
David Bomba
84895907d1 Merge pull request #662 from turbo124/master 
update invoice status via API
 2016-01-27 21:01:24 +11:00
David Bomba
fa2187ce20 update invoice status via API 2016-01-27 21:00:00 +11:00
David Bomba
6455e25c3a Merge pull request #660 from turbo124/master 
Include archived clients
 2016-01-27 14:32:09 +11:00
David Bomba
76f4530ffd include archived clients 2016-01-27 14:31:38 +11:00
David Bomba
910e9db7a0 Merge pull request #659 from turbo124/master 
Added ability to convert a quote to an invoice through the API
 2016-01-27 12:57:28 +11:00
David Bomba
4799b2e86c Added ability to convert a quote to an invoice through the API 2016-01-27 12:56:24 +11:00
David Bomba
2db27caf90 Merge pull request #658 from turbo124/master 
Bug fixes
 2016-01-27 11:40:41 +11:00
David Bomba
71b2970279 Bug fixes 2016-01-27 11:36:21 +11:00
David Bomba
4f5dd12ea0 Merge pull request #657 from turbo124/master 
Bug Fixes
 2016-01-27 07:53:22 +11:00
David Bomba
c2bb8711a0 Bug Fixed 2016-01-27 07:52:30 +11:00
Hillel Coren
9c96f09fc0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-26 22:22:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
David Bomba
f80e738882 Bug Fix in taxrate transformer 2016-01-26 22:47:19 +11:00
David Bomba
e57f8f3c2e Swagger Typo fix 2016-01-26 22:37:16 +11:00
David Bomba
a4df265d09 Update client via API 2016-01-26 22:36:00 +11:00
Hillel Coren
c0531a8a06 Merge pull request #649 from sakalauskas/dev-api 
Add ability to include invoice invitations via API
 2016-01-25 09:38:13 +02:00
Laurynas Sakalauskas
cfe1836770 Added invitation transformer 2016-01-24 18:55:36 +00:00
Laurynas Sakalauskas
91d44dd301 Add ability to include invoice invitations via API 2016-01-24 18:37:24 +00:00
Hillel Coren
e4a6effc60 Merge pull request #642 from sakalauskas/dev-api 
Fixed ping route & added a way to find client by email address or if …
 2016-01-24 19:54:01 +02:00
Laurynas Sakalauskas
2478ec59a4 Revert store() method 2016-01-24 17:06:34 +00:00
Laurynas Sakalauskas
68665d2972 Added filtering by email 2016-01-24 16:59:01 +00:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
Laurynas Sakalauskas
0d2025c834 Fixed ping route & added a way to find client by email address or if not exist - create a new 2016-01-22 10:33:38 +00:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0 Merging: Bugfixed version of Vendor / Expense module #635 2016-01-20 16:06:17 +02:00
Hillel Coren
6166464003 Merge: Make automatic conversion of quote to invoice optional (#636) 2016-01-20 10:41:57 +02:00
Hillel Coren
bf778aa616 Initial work on OFX support 2016-01-20 01:07:31 +02:00
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01:00
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
332e4984c4 Show currency code after amount 2016-01-18 16:35:05 +02:00
Hillel Coren
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
e4784035fe Bug fixes 2016-01-18 15:54:15 +02:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
Hillel Coren
6e5237b7dd Updated version 2016-01-17 16:36:22 +02:00
Hillel Coren
e5c455fd5d Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-17 15:07:44 +02:00
Hillel Coren
32ff390fea Revert change to hide unsent invoices 2016-01-17 15:07:32 +02:00
David Bomba
eeb977bab3 Added delete invoice functionality 2016-01-16 17:07:29 +11:00
David Bomba
12d3444808 By default include trashed invoices 2016-01-16 09:22:22 +11:00
steenrabol
f550e3734f bug fix to expense module - was not able to add a contact to a new vendor 2016-01-15 11:31:12 +01:00
David Bomba
7b61c8a46d Merge pull request #629 from turbo124/master 
return archived invoice as success
 2016-01-15 14:06:33 +11:00
David Bomba
ca591f4451 return archived invoice as success 2016-01-15 14:05:16 +11:00
Hillel Coren
9fdea0fe95 Fixes #627 2016-01-14 23:28:17 +02:00
Hillel Coren
4e77317767 Updated version 2016-01-13 23:46:12 +02:00
Hillel Coren
74c636aef2 Fix for #626 2016-01-13 23:38:15 +02:00
Hillel Coren
feb62b1253 Fix for #625 2016-01-13 20:06:01 +02:00
Hillel Coren
175c685032 Enabled creating recurring invoices through the API 2016-01-13 16:58:39 +02:00
Hillel Coren
8ab28ced1a Update version 2016-01-13 11:09:34 +02:00
Hillel Coren
ac58df4441 Bug fixes 2016-01-13 11:09:00 +02:00
Hillel Coren
8cefa9a707 Fixed problem with PDF preview after upgrading 2016-01-13 08:18:26 +02:00
Hillel Coren
7171e2b5a5 Fixed problem updating cache when upgrading 2016-01-12 19:18:38 +02:00
Hillel Coren
9bd6d1afe6 Fixed problem updating cache when upgrading 2016-01-12 15:54:19 +02:00
Hillel Coren
bc0ab97279 Enable setting the recurring due date through the API 2016-01-12 14:24:25 +02:00
David Bomba
6c4fe3f613 Revert "Working on API" 2016-01-12 21:17:08 +11:00
David Bomba
dab86580ba Merge pull request #616 from turbo124/master 
Working on API
 2016-01-12 20:30:32 +11:00
David Bomba
4e6d44fa87 Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-12 20:28:34 +11:00
David Bomba
2b784ee85d If no invoice_number is set from API, automatically generate invoice_number 2016-01-12 20:28:20 +11:00
Hillel Coren
bdec20487a Updated version 2016-01-12 11:19:09 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
Hillel Coren
5dbdec43f3 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-12 08:57:28 +02:00
Hillel Coren
90e7d5dafa Bug fixes 2016-01-12 08:57:19 +02:00
David Bomba
3e0b6948b5 Send down all quotes and recurring invoices in invoices GET call 2016-01-12 13:02:08 +11:00
steenrabol
bcffedcbd3 update from master 2016-01-11 20:41:02 +01:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja 
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
 2016-01-11 20:39:18 +01:00
steenrabol
f90c759078 Expense module 2016-01-11 20:20:42 +01:00
Hillel Coren
cf24684adb Check user is pro to use custom fonts 2016-01-11 14:50:17 +02:00
Hillel Coren
904627e5b4 Use buttons by default in styled emails 2016-01-11 14:40:48 +02:00
Hillel Coren
61f3bedc48 Added check for mail config settings 2016-01-11 13:07:41 +02:00
Hillel Coren
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +02:00
Hillel Coren
5fbe59fa8b Auto-set last used design as account default for non pro 2016-01-10 20:17:55 +02:00
Hillel Coren
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +02:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
d8cb1b436d Expense module 2016-01-09 09:08:24 +01:00
steenrabol
d0bfe82512 Expense module 2016-01-09 06:24:43 +01:00
steenrabol
d89dc2e827 Expenses 2016-01-08 19:01:00 +01:00
David Bomba
9050c8790e Bug Fixes 2016-01-08 09:56:06 +11:00
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
steenrabol
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
steenrabol
17af1e2b9c Expenses 2016-01-07 16:14:11 +01:00
steenrabol
4a0a9a3c99 expense 2016-01-07 12:08:20 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
steenrabol
45ba7ffc3b test 2016-01-07 09:11:18 +01:00
Hillel Coren
77f9e89b40 Added _id to header/body font properties 2016-01-07 09:19:57 +02:00
Hillel Coren
14192846e8 Merging: custom font support 2016-01-07 09:08:30 +02:00
Hillel Coren
7beeb78126 Enabled updating/archiving invoice through the API 2016-01-06 22:46:11 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
Hillel Coren
9dc890d4f0 Include archived data when loading account data with the API 2016-01-06 19:33:34 +02:00
steenrabol
d1bef24ede Expenses 2016-01-06 16:49:06 +01:00
steenrabol
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
Hillel Coren
6e98e9b60d Merge pull request #594 from joshuadwire/more-payment-terms 
Add due date settings for recurring invoices
 2016-01-06 12:07:05 +02:00
Hillel Coren
c91b15590c Fixes #601 2016-01-06 09:55:36 +02:00
Hillel Coren
e3e497bb8c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-06 09:52:33 +02:00
Hillel Coren
18155a9482 Working on data import tranformers 2016-01-06 09:52:26 +02:00
David Bomba
35027dd139 API Put Stubs 2016-01-06 15:01:52 +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
598a112101 Fixes #595 2016-01-02 22:37:45 +02:00
Joshua Dwire
103bce3f48 Make recurring invoice due date settings more translatable 2016-01-01 17:37:47 -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
2144870b96 Removed getInvoiceId from non-Wave transformers 2015-12-31 16:14:30 +02:00
Hillel Coren
e5ca3973d8 Revert "Revert "Re-revert "Improve Import Support"""" 2015-12-31 16:11:44 +02:00
Hillel Coren
f5530a30b2 Revert "Re-revert "Improve Import Support""" 2015-12-31 15:36:53 +02:00
Hillel Coren
e60c52e93c Revert "Revert "Improve Import Support"" 2015-12-31 15:06:30 +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
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
60daef8d58 Bug fixes 2015-12-29 19:49:40 +02: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
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
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
68ee5d04a4 Tax Rate Transformer added 2015-12-21 18:36:29 +11:00
David Bomba
083e995e2b Working on API Transformers 2015-12-20 08:30:06 +11:00