Commit Graph

892 Commits

Author SHA1 Message Date
Joshua Dwire 3d84e408bb Only do annual income calculations if we're going to show the BlueVinePromo. 2016-11-14 13:42:09 -05:00
Joshua Dwire 179713711f Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-14 13:34:27 -05:00
David Bomba fa39434ac9 Tasks via API (#1152)
* revert error reporting

* Add Task attributes
2016-11-14 20:43:10 +11:00
Joshua Dwire 82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Joshua Dwire 5bee41789f Show BlueVine quote and redirect to BlueVine 2016-11-10 18:24:54 -05:00
Hillel Coren 905593b525 Prevent emailing recurring invoice through API 2016-11-06 15:57:33 +02:00
Hillel Coren 26f4a84897 Track campaign fields with company 2016-11-06 14:16:18 +02:00
Hillel Coren ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
Hillel Coren 3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Joshua Dwire 5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
David Bomba d466a1bf5a bug fixes 2016-11-03 22:39:29 +11:00
David Bomba 06150ce30a add show() Client 2016-11-03 21:36:05 +11:00
Hillel Coren eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren 16940fd690 Fix translations in client portal 2016-10-30 20:12:02 +02:00
Hillel Coren 2a97fc5456 Prevent deleted invoice from being paid 2016-10-30 11:04:08 +02:00
Hillel Coren bd624710a8 Minor fixes 2016-10-28 12:01:35 +03:00
Hillel Coren bb0ce2da38 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-28 09:43:07 +03:00
David Bomba dedb85c8d6 Add / Update expense categories from API (#1124)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories
2016-10-28 12:59:57 +11:00
Hillel Coren 7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00
Hillel Coren c3c0ece14a Round qty in product report 2016-10-27 16:45:06 +03:00
Hillel Coren 185958ba2c Fix for logos in production 2016-10-27 12:03:25 +03:00
Hillel Coren 5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren 7fcc634a74 Redirect to dashboard when switching accounts if viewing an entity 2016-10-25 17:29:37 +03:00
Hillel Coren 6a55cf5b43 Add API support for expenses 2016-10-23 11:01:21 +03:00
Hillel Coren 83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren b448f459f8 Fix task timer #1109 2016-10-19 10:17:23 +03:00
Hillel Coren 89088e5517 Fix product list filter 2016-10-18 21:15:08 +03:00
Hillel Coren 733890ec3f Show archived/deleted in breadcrumbs 2016-10-18 17:55:07 +03:00
David Bomba b8d0498560 Merge pull request #1107 from turbo124/develop
Fix bug when deleting Vendor
2016-10-18 20:58:00 +11:00
David Bomba a8cf11604e fixed delete request type 2016-10-18 20:54:19 +11:00
David Bomba 3fcb560232 fixed delete request type 2016-10-18 20:53:17 +11:00
David Bomba f30a25b0eb fixed bug when saving vendorcontact 2016-10-18 20:51:34 +11:00
David Bomba ce0662f7b3 Merge pull request #1106 from turbo124/develop
Vendor API POST and PUT methods
2016-10-18 20:36:40 +11:00
David Bomba b013d118ab Add Delete/Update methods into VendorAPIController 2016-10-18 19:31:21 +11:00
Hillel Coren 7c0eea08cd Added new upgrade modal 2016-10-16 09:38:04 -04:00
Hillel Coren b36ea06303 Bug fix for reports 2016-10-13 12:46:29 +03:00
Hillel Coren 147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren d046679dab Support OAuth login on iPhone 2016-10-06 15:46:27 +03:00
Hillel Coren a1fcc3519a Support validating OAuth token 2016-10-05 21:51:08 +03:00
Hillel Coren acc48081e5 Improve add gateway process 2016-10-05 17:02:36 +03:00
Hillel Coren de7ecbd3cb Fix for tests 2016-10-02 11:47:24 +03:00
Hillel Coren 6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren 078527443f Enable recurring for a cloned invoice 2016-09-26 09:54:59 +03:00
Hillel Coren 0d3be448df Bug fixes for import page 2016-09-25 21:13:14 +03:00
Hillel Coren b624bb13c3 Fix problem clearing duplicate invoice number error 2016-09-25 20:36:15 +03:00
Hillel Coren ae2c9d6252 Enable resubmitting form if invoice fails to save 2016-09-25 13:42:15 +03:00
Hillel Coren f3a9f88107 Enable resubmitting form if invoice fails to save 2016-09-25 13:41:38 +03:00
Hillel Coren 249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren 5d04bdab21 Add credits to the client portal 2016-09-23 12:02:48 +03:00
Hillel Coren bcb5b7ca76 Prevent using update for ninja instance 2016-09-21 21:22:30 +03:00