Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
2,488 Commits 7 Branches 919 Tags 2 GiB
cc03b4456c
Commit Graph

511 Commits

Author SHA1 Message Date
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
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
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
3878fe9324 Validation rule realignment 2016-02-10 08:51:08 +11: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
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
0ce9e426d9 Hid 'test email' button until issue updating connection info is resolved 2016-02-03 22:45:39 +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
65d3667600 Increased timeout when installing/updating 2016-02-03 10:07:44 +02: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
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
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
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
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
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
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