1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 06:32:40 +01:00
Commit Graph

2730 Commits

Author SHA1 Message Date
Hillel Coren
71e2b1f165 Cleaned up routes file 2016-12-06 14:00:27 +02:00
Hillel Coren
7c4d0a2af5 Label credits created by deleting payments 2016-12-06 12:04:30 +02:00
Hillel Coren
f62f18ea78 Enabled specifying email from address 2016-12-06 11:37:04 +02:00
Hillel Coren
25a95e8e25 Don't apply subdomain rules to self host 2016-12-05 21:54:10 +02:00
Hillel Coren
67f44775e3 Fix for tests 2016-12-05 20:56:57 +02:00
Hillel Coren
2d0effda63 Support exporting expenses 2016-12-05 20:35:01 +02:00
Hillel Coren
78a2a66729 Hide draft invoices from the client portal 2016-12-05 10:11:33 +02:00
Hillel Coren
ad07599e92 Hide draft invoices from the client portal 2016-12-05 00:35:08 +02:00
Hillel Coren
a0481310a3 Hide draft invoices from the client portal 2016-12-04 23:51:18 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
9398c45b56 Prevent changing credit's client 2016-12-04 12:24:48 +02:00
Hillel Coren
441ff9bceb Fix for gateway type in buy now buttons 2016-12-04 11:48:20 +02:00
Hillel Coren
f739976de2 Fix for gateway type in buy now buttons 2016-12-04 11:47:58 +02:00
Hillel Coren
531b707945 Support setting redirect URL for buy now button 2016-12-02 15:37:25 +02:00
Hillel Coren
c8d4941fa6 Support setting redirect URL for buy now button 2016-12-02 14:51:05 +02:00
Hillel Coren
d7f22041ab Added UI setting to enable JS PDF renderer 2016-12-01 21:39:00 +02:00
Hillel Coren
f182c281fe Log cURL errors 2016-12-01 15:03:12 +02:00
Hillel Coren
7f72836aad Make larger area clickable in datatable header 2016-11-30 20:33:05 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
556737f929 Update version 2016-11-29 21:07:07 +02:00
Hillel Coren
42ee7f4f1c Update version 2016-11-29 21:06:50 +02:00
Hillel Coren
b97693508e Fix for payment buttons in HTML emails 2016-11-29 20:24:06 +02:00
Hillel Coren
0731165d8f Fix for payment buttons in HTML emails 2016-11-29 20:21:17 +02:00
Hillel Coren
243f345e85 Merge fix for expense categories in API 2016-11-29 19:54:40 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
f94146fb5e Fix for JSON payment import 2016-11-28 10:56:59 +02:00
Hillel Coren
408aede80a Fix for JSON payment import 2016-11-28 10:55:00 +02:00
Hillel Coren
1819f72847 Merge fix to show archived payments to clients 2016-11-27 17:04:47 +02:00
Hillel Coren
682ce02995 Merge dashboard fix 2016-11-27 17:00:29 +02:00
Hillel Coren
a99079da95 Improve error if email fails to send 2016-11-27 16:58:32 +02:00
Hillel Coren
e9a5d60d7f Working on bulk lists 2016-11-27 14:20:58 +02:00
Hillel Coren
ae28c3c5c3 Working on bulk list changes 2016-11-27 11:46:32 +02:00
Hillel Coren
12fd825de5 Working on datatables on vendor page 2016-11-25 16:02:39 +02:00
Hillel Coren
b83647facc Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-25 12:53:44 +02:00
Hillel Coren
1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
David Bomba
c771b12494 enable stateless social login (#1170) 2016-11-25 20:56:48 +11:00
Hillel Coren
eb710348bf Refactor datatable sort columns 2016-11-24 11:46:57 +02:00
Hillel Coren
5c6c9e399b Working on datatables 2016-11-24 11:41:11 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
1cc5795aa8 Show archived payments in client portal 2016-11-22 21:17:32 +02:00
Hillel Coren
ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren
23c098014a Improved status selection 2016-11-18 15:31:43 +02:00
Hillel Coren
3c5ecd57f4 Updated version 2016-11-17 16:29:29 +02:00
Hillel Coren
fce46114bc Working on list status select 2016-11-17 16:29:02 +02:00
Hillel Coren
de2825750d Add eager loading to API tasks 2016-11-16 13:12:10 +02:00
Hillel Coren
966d3cedba Fix for PayFast 2016-11-16 12:41:59 +02:00
Hillel Coren
2cd574d349 Fix for PayFast 2016-11-16 12:41:47 +02:00
Hillel Coren
e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Hillel Coren
3680985a20 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-15 21:28:34 +02:00
Hillel Coren
7e80f4de2e Fix subscription JSON response 2016-11-15 10:39:35 +02:00
Joshua Dwire
c04a92b836 Exclude deleted payments from 12-month revenue 2016-11-14 13:42:27 -05:00
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
Hillel Coren
a70380dd88 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-14 15:13:58 +02:00
David Bomba
b7a5ae6059 Handle null invoice object in task (#1153) 2016-11-14 21:25:16 +11:00
David Bomba
fa39434ac9 Tasks via API (#1152)
* revert error reporting

* Add Task attributes
2016-11-14 20:43:10 +11:00
Hillel Coren
94890af980 Updated readme 2016-11-13 23:47:51 +02:00
Hillel Coren
a9a94df973 Fix for expense documents 2016-11-13 09:14:40 +02:00
Hillel Coren
d53d7739b4 Fix for expense documents 2016-11-13 09:14:25 +02:00
Hillel Coren
79d745a26b Simplify logo URL code 2016-11-11 12:57:28 +02:00
Hillel Coren
8c2e5ebdbf Simplify logo URL code 2016-11-11 12:57:12 +02: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
61a898a71d Update checkdata script 2016-11-09 16:09:19 +02:00
Hillel Coren
bc8c24a67c Update checkdata script 2016-11-09 16:08:22 +02:00
Hillel Coren
660727d23b Remove duplicate line of code 2016-11-06 19:42:43 +02:00
Hillel Coren
b620356db1 Merge branch 'release-2.8.0' 2016-11-06 19:29:19 +02:00
Hillel Coren
7155524575 Update version 2016-11-06 15:58:00 +02:00
Hillel Coren
905593b525 Prevent emailing recurring invoice through API 2016-11-06 15:57:33 +02:00
Hillel Coren
a76e9ae437 Log email error for self host installs 2016-11-06 15:21:09 +02:00
Hillel Coren
26f4a84897 Track campaign fields with company 2016-11-06 14:16:18 +02:00
Hillel Coren
31d5e28b69 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-06 13:45:09 +02:00
Hillel Coren
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
David Bomba
c905e781c0 revert error reporting (#1142) 2016-11-05 12:32:06 +11:00
David Bomba
0a4d55e0aa Generic message
Change error text to generic Entity not found.
2016-11-05 06:36:49 +11:00
David Bomba
f5e18f3355 API Error handling improvements (#1141)
* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* Client not found error handling via API

* Client not found error handling via API
2016-11-05 06:20:33 +11:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Hillel Coren
fbf618a226 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-04 11:48:37 +02:00
Hillel Coren
5c9b435b97 Fix for contact sorting when saving 2016-11-04 11:48:27 +02:00
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
David Bomba
9d4a121662 Merge pull request #1139 from turbo124/develop
Dashboard bug fix
2016-11-03 22:41:48 +11:00
David Bomba
d466a1bf5a bug fixes 2016-11-03 22:39:29 +11:00
David Bomba
88f9cea3bb Add show() resource route for ClientApiController (#1138)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer

* add show() Client
2016-11-03 21:39:33 +11:00
David Bomba
06150ce30a add show() Client 2016-11-03 21:36:05 +11:00
Hillel Coren
9769f206f2 Fix for outstanding amount on dashboard 2016-11-02 09:43:57 +02:00
Hillel Coren
e677569351 Support importing VAT number with client CSV 2016-11-01 13:19:35 +02:00
Hillel Coren
6353ad05ff Remove 'unamed client' label 2016-10-31 16:08:00 +02:00
Hillel Coren
bf6fd23aea Show 'Pro' label when on trial 2016-10-31 12:59:48 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
b39f2f4ba5 Ensure invoice always has an invitation 2016-10-31 09:06:55 +02:00
Hillel Coren
16940fd690 Fix translations in client portal 2016-10-30 20:12:02 +02:00
Hillel Coren
752e674a34 Remove branding if white labeled 2016-10-30 18:09:22 +02:00
Hillel Coren
02c300e9f9 Prevent session history from showing as blank 2016-10-30 11:23:36 +02:00
Hillel Coren
2a97fc5456 Prevent deleted invoice from being paid 2016-10-30 11:04:08 +02:00
Hillel Coren
7b5cd9e4c1 Eager load contact with activities 2016-10-30 08:50:58 +02:00
David Bomba
147a1b1a94 Add in additional fields for activities transformer (#1129)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer
2016-10-29 18:48:58 +11:00
Hillel Coren
346dde8e97 Fix for parseCSV constructor error 2016-10-28 14:35:32 +03:00
Hillel Coren
bd624710a8 Minor fixes 2016-10-28 12:01:35 +03:00
David Bomba
8f1a9a2e5d Expense Categories route (#1125)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route
2016-10-28 19:37:28 +11:00
Hillel Coren
bb0ce2da38 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-28 09:43:07 +03:00