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

3360 Commits

Author SHA1 Message Date
Hillel Coren
bd6edb2d2c Merge inclusive tax fix 2017-03-24 14:58:43 +03:00
Hillel Coren
4ce76ef138 Merge inclusive tax fix 2017-03-24 14:58:23 +03:00
Hillel Coren
b8c0375b3e Merge inclusive tax fix 2017-03-24 14:54:43 +03:00
Hillel Coren
58af36b2d2 Merge inclusive tax fix 2017-03-24 14:53:54 +03:00
Hillel Coren
3061209ea7 Improve new company process #460 2017-03-24 14:51:24 +03:00
Hillel Coren
a6e546bcdc Fix for inclusive tax rates 2017-03-24 13:29:38 +03:00
Hillel Coren
462d6e95d5 Fix for supporting multiple payment gateways 2017-03-23 19:45:45 +02:00
Hillel Coren
d690fc5c79 Added activity report 2017-03-23 17:39:28 +02:00
Hillel Coren
d8f55445c3 Added activity report 2017-03-23 17:37:22 +02:00
Hillel Coren
34776b2eb2 Show ‘Discount’ for negative online payment surcharges 2017-03-23 17:17:05 +02:00
Hillel Coren
fe3710fe4b Notify user if auto bill fails 2017-03-23 15:55:46 +02:00
Hillel Coren
1df20adca4 Support reseting counters 2017-03-23 11:39:44 +02:00
Hillel Coren
ec5bfb4129 Update version 2017-03-22 22:46:53 +02:00
Hillel Coren
1cadaffe3f Update version 2017-03-22 22:46:31 +02:00
Hillel Coren
6726f278e5 Update Android app link 2017-03-22 21:41:01 +02:00
Hillel Coren
47ece1076b Fix for iframe offsite payments 2017-03-22 21:39:05 +02:00
Hillel Coren
1f01c006eb Support importing settings 2017-03-22 11:50:55 +02:00
Hillel Coren
0079d3a244 Use phantomjs cloud as backup for ninja install 2017-03-21 17:28:22 +02:00
Hillel Coren
625c6b381f Check for active gateway 2017-03-21 17:19:00 +02:00
Hillel Coren
c01681c42c Check for active gateway 2017-03-21 17:18:36 +02:00
Hillel Coren
754f11cb51 Merge white label fix 2017-03-21 15:42:12 +02:00
Hillel Coren
a06fe489ba Add cors for buy now buttons 2017-03-21 15:41:01 +02:00
Hillel Coren
e40791c616 Add redirect for terms 2017-03-21 11:47:46 +02:00
Hillel Coren
41e48448a4 Don't log model not found errors 2017-03-21 11:46:13 +02:00
Hillel Coren
bc04d66371 Ensure account gateway fields array is initialized 2017-03-21 11:32:02 +02:00
Hillel Coren
6a5b189912 Hide /logo/ 404s for ninja install 2017-03-21 11:18:36 +02:00
Hillel Coren
7aba027896 Minor tweaks 2017-03-21 10:13:48 +02:00
Hillel Coren
a8880be395 Don't log TokenMismatchException errors 2017-03-20 22:16:13 +02:00
Hillel Coren
ea464aa814 Handle image upload exception 2017-03-20 16:02:59 +02:00
Hillel Coren
e4dae64e5e Don't log payment hook errors 2017-03-20 15:54:43 +02:00
Hillel Coren
74fd481379 Don't log payment hook errors 2017-03-20 15:54:36 +02:00
Hillel Coren
72c0365aee Fix for Zapier search failure 2017-03-20 13:56:24 +02:00
Hillel Coren
1a4458567c Merge Zapier and trans_choice fixes 2017-03-20 13:55:38 +02:00
Hillel Coren
546e1b56dc Fix for email templates 2017-03-20 13:18:58 +02:00
Hillel Coren
bb38aaccb5 Fix for product import 2017-03-20 12:24:21 +02:00
Hillel Coren
59dd3d8982 Fix for product import 2017-03-20 12:23:56 +02:00
Hillel Coren
5ceb2d9ab6 Fix for buy now clients 2017-03-20 12:14:45 +02:00
Hillel Coren
653fb6357a Fix for buy now clients 2017-03-20 12:14:06 +02:00
Hillel Coren
43c04415ef Support changing primary vendor contact 2017-03-20 11:59:29 +02:00
Hillel Coren
1e575e50e9 Fix for reminders 2017-03-20 10:21:14 +02:00
Hillel Coren
6788147bd1 Fix for reminders 2017-03-20 10:20:51 +02:00
Hillel Coren
01329e846f Working on API docs 2017-03-19 18:03:17 +02:00
Hillel Coren
1fb06295d4 Tweak texts 2017-03-19 17:17:29 +02:00
Hillel Coren
81671152e5 Hide partial field if using surcharge gateway fee 2017-03-19 17:03:46 +02:00
Hillel Coren
3bcba163c4 Merge new line email template fix 2017-03-19 15:35:20 +02:00
Hillel Coren
91d1a4ca4e Added gateway fee tests 2017-03-19 15:31:25 +02:00
Hillel Coren
64a92bbc2e Fix for newlines in email templates 2017-03-19 09:15:21 +02:00
Hillel Coren
c68bbf252c Fixes for gateway fees 2017-03-17 16:58:33 +02:00
Hillel Coren
0f63ea782f Fix for gateway fees 2017-03-17 16:41:19 +02:00
Hillel Coren
3883c3d4f6 Working on gateway fees 2017-03-17 15:16:30 +02:00
Hillel Coren
0791e6fbc5 Working on gateway fees 2017-03-17 15:10:33 +02:00
Hillel Coren
fa2e50f15c Working on gateway fees 2017-03-17 14:55:15 +02:00
Hillel Coren
5f23c89121 Working on gateway fees 2017-03-17 13:57:56 +02:00
Hillel Coren
293c4f2743 Working on gateway fees 2017-03-17 13:47:16 +02:00
Hillel Coren
23eee0183e Working on gateway fees 2017-03-17 12:47:17 +02:00
Hillel Coren
b2cfc8b99a Working on gateway fees 2017-03-17 12:13:27 +02:00
Hillel Coren
7b2f46b087 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2017-03-17 11:47:46 +02:00
Hillel Coren
31cc9226a5 Merge pull request #1390 from chez-nestor/add_contact_api
Add a Contact API
2017-03-17 11:46:08 +02:00
Louis-Rémi Babé
79702cbf90 Fix header name for API token 2017-03-17 10:28:46 +01:00
Hillel Coren
85635c8a27 Working on gateway fees 2017-03-16 23:12:56 +02:00
Hillel Coren
4e7050206d Working on gateway fees 2017-03-16 23:02:32 +02:00
Hillel Coren
fb09a38efa Working on gateway fees 2017-03-16 22:58:31 +02:00
Hillel Coren
be6c9035aa Working on gateway fees 2017-03-16 22:56:13 +02:00
Hillel Coren
0379bb61fa Working on gateway fees 2017-03-16 22:34:45 +02:00
Hillel Coren
5122a2114c Use invoice tax settings for edit UI 2017-03-16 20:20:08 +02:00
Hillel Coren
e0b05abac3 Working on gateway fees 2017-03-16 19:51:38 +02:00
Hillel Coren
d105943bf3 Fix for gateway fees w/partial 2017-03-16 19:34:14 +02:00
Hillel Coren
0c3db5a8e4 Support taxing the fee 2017-03-16 19:18:14 +02:00
Hillel Coren
7305c9e483 Fix quote email subject 2017-03-16 19:04:29 +02:00
Hillel Coren
daec25fe79 Fix quote email subject 2017-03-16 19:04:04 +02:00
Hillel Coren
beb25e8dee Working on gateway fees 2017-03-16 18:34:51 +02:00
Hillel Coren
0ddd4479b7 Working on gateway fees 2017-03-16 18:25:46 +02:00
Hillel Coren
3957b8a92b Fix for offsite payments w/subdomains 2017-03-16 17:43:57 +02:00
Hillel Coren
54275853fd Fix for offsite payments w/subdomains 2017-03-16 17:43:29 +02:00
Hillel Coren
2a7dec8893 Support negative gateway fees 2017-03-16 17:32:46 +02:00
Hillel Coren
63096aaae1 Working on gateway fees 2017-03-16 16:15:58 +02:00
Hillel Coren
21166a3be7 Working on gateway fees 2017-03-16 16:03:17 +02:00
Hillel Coren
022ad2e414 Default account to use line items taxes 2017-03-15 20:25:25 +02:00
Hillel Coren
f9b8603d09 Working on gateway fees 2017-03-15 20:10:40 +02:00
Hillel Coren
d83f5d2633 Working on gateway fees 2017-03-15 17:24:01 +02:00
Hillel Coren
5fd2c456da Working on gateway fees 2017-03-15 17:09:23 +02:00
Hillel Coren
5fcf0c57a4 Working on gateway fees 2017-03-14 23:27:09 +02:00
Hillel Coren
d1b8d771f6 Working on gateway fees 2017-03-14 17:45:36 +02:00
Hillel Coren
7d0ec404da Working on gateway fees 2017-03-14 15:18:31 +02:00
Hillel Coren
ce3afdaf8d When Archiving/Deleting Recurring Invoices, Silently Drops into Invoice Screen #1377 2017-03-13 21:27:32 +02:00
Hillel Coren
c7eb38c3ff Support updating client with buy now link 2017-03-13 19:58:27 +02:00
Hillel Coren
dac110e7e0 Support updating client with buy now link 2017-03-13 19:57:16 +02:00
Hillel Coren
dc058ebb89 Merge fix for invalid links 2017-03-13 19:55:08 +02:00
Hillel Coren
88bed420b1 Show contact email on error screen 2017-03-13 19:25:29 +02:00
Hillel Coren
de7d23b3f5 Set phantomjs secret during install 2017-03-13 17:06:26 +02:00
Hillel Coren
b382b30d90 Set phantomjs secret during install 2017-03-13 17:06:05 +02:00
Hillel Coren
9543dd3a34 Timezone fix for recurring invoices 2017-03-13 14:56:43 +02:00
Hillel Coren
93cc9e17ef Timezone fix for recurring invoices 2017-03-13 14:54:15 +02:00
Hillel Coren
cbcc299187 Update version 2017-03-12 22:14:59 +02:00
Hillel Coren
3886df1545 Update version 2017-03-12 22:14:23 +02:00
Hillel Coren
12a46b8c17 Use timezone date in custom invoice number 2017-03-12 22:13:53 +02:00
Hillel Coren
d03dc07d30 Improve order of convert quote activities 2017-03-12 22:01:27 +02:00
Hillel Coren
929a1e1ee0 Improve order of convert quote activities 2017-03-12 22:01:08 +02:00
Hillel Coren
ca67a76b95 Fix for tax report with amount discount 2017-03-11 22:25:01 +02:00
Hillel Coren
8328cea8c3 Fix for tax report with amount discount 2017-03-11 22:23:31 +02:00
Hillel Coren
0f36143137 Fix for client balance when approving quote 2017-03-10 16:37:38 +02:00
Hillel Coren
8172656cee Working on tests 2017-03-10 16:36:47 +02:00
Hillel Coren
5986759fe0 Checks for InnoDB 2017-03-10 12:50:18 +02:00
Hillel Coren
70b7167d56 Checks for InnoDB 2017-03-10 12:48:23 +02:00
Hillel Coren
d06ea6c72e Check for InnoDB engine 2017-03-09 21:44:36 +02:00
Hillel Coren
e08f583c3a Check for InnoDB engine 2017-03-09 21:43:53 +02:00
Hillel Coren
efc226c23d Update check data 2017-03-09 21:32:10 +02:00
Hillel Coren
be10b80fbf Notify on queue errors 2017-03-09 20:17:15 +02:00
Hillel Coren
d854269228 Working on adding check-data to Travis 2017-03-09 19:54:03 +02:00
Hillel Coren
bd9e94f0e1 Merge pull request #1381 from chez-nestor/fix_operationId
Fix swagger's operationId for all API endpoints
2017-03-09 19:16:19 +02:00
Louis-Rémi Babé
d7f3ac8d2c Fix swagger's operationId for all API endpoints 2017-03-09 18:12:35 +01:00
Hillel Coren
59b26e53ac Working on adding check-data to Travis 2017-03-09 18:07:20 +02:00
Hillel Coren
94791a6c33 Working on adding check-data to Travis 2017-03-09 17:52:58 +02:00
Hillel Coren
01ca660b6b Working on adding check-data to Travis 2017-03-09 17:48:21 +02:00
Hillel Coren
6eef179a67 Working on adding check-data to Travis 2017-03-09 17:23:56 +02:00
Hillel Coren
bb898d8f5a Log more PhantomJS failure details 2017-03-09 16:24:12 +02:00
Hillel Coren
5f8d8517af Remove 2017-03-09 16:09:52 +02:00
Hillel Coren
8623c3a3c6 Clarify recurring invoice status 2017-03-09 15:08:18 +02:00
Hillel Coren
bc4468dcfb Track job errors in the log 2017-03-09 14:24:55 +02:00
Hillel Coren
ca00ee19c6 Track job errors in the log 2017-03-09 14:23:30 +02:00
Hillel Coren
e9685c80b3 Fix for tests 2017-03-09 13:38:17 +02:00
Hillel Coren
9fa08046cf Fix for invoice API delete 2017-03-09 12:25:56 +02:00
Hillel Coren
2a35ed54fe Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2017-03-09 12:25:26 +02:00
Hillel Coren
a552b87968 Merge pull request #1378 from chez-nestor/missing_api_methods
[WIP] Implement missing resources methods
2017-03-09 12:24:41 +02:00
Louis-Rémi Babé
9f1df5e924 Fix remaining swagger docs errors
+ Take @hillelcoren remarks into account
2017-03-09 11:11:45 +01:00
Hillel Coren
4c5a5ef941 CSV import improvements 2017-03-09 11:55:11 +02:00
Hillel Coren
a50ca5a328 Handle currency symbol when setting product cost 2017-03-09 11:33:55 +02:00
Hillel Coren
a7bc5bcef7 Fix PDF attachment with local PhantomJS 2017-03-08 21:48:31 +02:00
Hillel Coren
d72c199d0b Fix PDF attachment with local PhantomJS 2017-03-08 21:45:28 +02:00
Hillel Coren
8458d5cb98 Fix invoice number w/date format 2017-03-08 20:45:42 +02:00
Hillel Coren
6e83579c14 Fix invoice number w/date format 2017-03-08 20:45:24 +02:00
Louis-Rémi Babé
e16e730138 Implement missing resources methods
+ Fix Swagger doc
2017-03-08 17:15:30 +01:00
Hillel Coren
1fb6d04172 Group task report by project 2017-03-08 11:41:24 +02:00
Hillel Coren
aec951cc6d Fix truncateString 2017-03-08 11:31:56 +02:00
Hillel Coren
1547a75731 Fix truncateString 2017-03-08 11:31:34 +02:00
Hillel Coren
7f2ec78938 Update user when signing up for WePay 2017-03-08 11:29:13 +02:00
Hillel Coren
bc4f70e3ed Remove mb_strimwidth 2017-03-08 08:47:26 +02:00
Hillel Coren
cc9c3a3b30 Remove mb_strimwidth 2017-03-08 08:46:24 +02:00
Hillel Coren
3dee1692c2 Improvements to CSV import 2017-03-07 11:09:53 +02:00
Hillel Coren
1fd6cabd6b Change recipient of cancelled email 2017-03-07 10:27:42 +02:00
Hillel Coren
72bd5c4aa7 Change recipient of cancelled email 2017-03-07 10:27:14 +02:00
Hillel Coren
cc22a8b150 Update version 2017-03-06 17:20:51 +02:00
Hillel Coren
4000ef9a9c Update version 2017-03-06 17:20:31 +02:00
Hillel Coren
085c82ab3e Show terms checkbox even if terms are blank 2017-03-06 12:22:32 +02:00
Hillel Coren
d1edeb9dc7 Show terms checkbox even if terms are blank 2017-03-06 12:22:01 +02:00
Hillel Coren
d024e08778 Add CORS support for buy now buttons 2017-03-06 11:27:25 +02:00
Hillel Coren
6aeaeaf272 Add CORS support for buy now buttons 2017-03-06 11:27:03 +02:00
Hillel Coren
abd93d31e3 Add CORS support for buy now buttons 2017-03-06 11:25:01 +02:00
Hillel Coren
b6dab2bc13 Add CORS support for buy now buttons 2017-03-06 11:23:50 +02:00
Hillel Coren
675f899744 Allow ping with api_secret or account token 2017-03-05 12:30:08 +02:00