Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity
4,712 Commits 7 Branches 916 Tags 2 GiB
cc2a64acac
Commit Graph

2824 Commits

Author SHA1 Message Date
Hillel Coren
a5ead8407d Show read only values when editing a payment 2016-12-25 13:15:58 +02:00
Hillel Coren
e599b7ee89 Added fields to search (id number, vat number, ...) 2016-12-25 12:48:26 +02:00
Hillel Coren
1a27e28ff5 Support importing products using JSON 2016-12-25 12:32:11 +02:00
Hillel Coren
c26bebd063 Add plan deadline logging 2016-12-25 11:49:33 +02:00
Hillel Coren
5f39ec1162 Add option to disable map #1223 2016-12-25 09:57:33 +02:00
Hillel Coren
67b7d6ff21 Make sure invoice is emailed if auto-billing fails 2016-12-22 19:42:21 +02:00
Hillel Coren
4658abfbd4 Improved number parsing for CSV import 2016-12-22 19:17:45 +02:00
Hillel Coren
b7465a8f17 Fix data import 2016-12-22 19:12:12 +02:00
Hillel Coren
3a845a54e7 Don't strtolower invoice number when importing 2016-12-22 17:56:35 +02:00
Hillel Coren
4ed44be7a9 Don't prevent importing duplicate products 2016-12-22 17:28:42 +02:00
Hillel Coren
655da01338 Improvement to invoice import 2016-12-22 13:53:14 +02:00
Hillel Coren
80cc8ae2b4 Prevent online payments for quotes 2016-12-22 13:49:20 +02:00
Hillel Coren
d12a1a35de Fix for % translation issue 2016-12-21 14:39:26 +02:00
Hillel Coren
700bac552b Fix for % translation issue 2016-12-21 14:37:57 +02:00
Hillel Coren
6e8f87a198 Fix total balance for vendor with multiple expense currencies 2016-12-20 17:48:58 +02:00
Hillel Coren
cd97904b75 Remove mcrypt #1188 2016-12-20 16:28:44 +02:00
Hillel Coren
312e8e8e48 Fixes #1211 2016-12-20 15:09:41 +02:00
Hillel Coren
6c30a603f6 Update version to 2.9.1 2016-12-20 14:44:06 +02:00
Hillel Coren
68d3322032 Fix for #1209 2016-12-20 10:50:23 +02:00
Hillel Coren
1ee1beb070 Don't show payment options if invoice isn't sent 2016-12-19 20:52:16 +02:00
Hillel Coren
f275d1a295 Don't allow changing client once task/expense has been invoiced 2016-12-19 20:39:48 +02:00
Hillel Coren
db26b169cd Clarify sample values in invoice design page 2016-12-19 20:30:27 +02:00
Hillel Coren
2f8344df66 Added deletedQuote subscription 2016-12-19 20:06:30 +02:00
Hillel Coren
5c891fa49e Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-12-19 13:22:12 +02:00
Hillel Coren
989d55d692 Fix for module column headers 2016-12-19 13:22:03 +02:00
Hillel Coren
82e2331e73 Fix recurring invoice search 2016-12-19 11:48:11 +02:00
Hillel Coren
b0cfcf7748 Notify on billing completion 2016-12-18 21:39:25 +02:00
David Bomba
f88aa8f8e3 fix for non boolean output (#1201) 2016-12-18 14:17:20 +11:00
Hillel Coren
f8d95e1a31 Merge pull request #1184 from justkidding96/develop 
Added new event listeners for Zapier
 2016-12-16 15:17:30 +02:00
Hillel Coren
89e38d888e Bumped version number to 2.9.0 2016-12-15 17:21:36 +02:00
Hillel Coren
fc87cbafe6 Support exporting products 2016-12-15 15:28:24 +02:00
Hillel Coren
7085c0137f Fix payments column headers 2016-12-15 15:20:36 +02:00
Hillel Coren
82857d642f Adjustments to task projects 2016-12-15 15:13:24 +02:00
Hillel Coren
92a60221a5 Adjustments to task projects 2016-12-15 15:11:04 +02:00
Hillel Coren
d1f496023b Adjustments to task projects 2016-12-15 14:17:10 +02:00
Hillel Coren
a3cb3a0cfb Working on discounts 2016-12-15 13:16:19 +02:00
Hillel Coren
bbb0e07eca Working on discounts 2016-12-15 12:52:10 +02:00
Hillel Coren
16dba695b1 Support bulk mark paid 2016-12-14 21:47:22 +02:00
Hillel Coren
9201004f33 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-12-14 16:19:30 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
Hillel Coren
8015b88c31 Auto-run module migrations 2016-12-13 12:51:13 +02:00
David Bomba
0ceeefb10b Improve error reporting from API (#1194) 
* apply API response across all requests

* apply API response across all requests
 2016-12-13 17:52:09 +11:00
Hillel Coren
2ccb54bf42 Added rbits data 2016-12-12 20:42:51 +02:00
Hillel Coren
9c97c50947 CRUD fixes 2016-12-12 12:50:55 +02:00
Hillel Coren
d5134daa01 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-12-12 00:38:10 +02:00
Hillel Coren
03e9e978d7 Added social icons to navigation footer 2016-12-12 00:25:22 +02:00
David Bomba
ba9c06cb18 API Error handling (#1189) 
* bug fix

* csrf filters

* request API error handler implementation

* add utils dependency

* add response dependency
 2016-12-11 20:31:29 +11:00
Hillel Coren
137c718199 CRUD 2016-12-09 14:02:29 +02:00
Hillel Coren
9a92f11657 CRUD 2016-12-09 13:48:46 +02:00
Hillel Coren
ee2e028782 CRUD 2016-12-09 13:38:11 +02:00
Hillel Coren
4aa087784c CRUD 2016-12-09 13:20:02 +02:00
Hillel Coren
338f3f0c7f CRUD 2016-12-09 13:17:04 +02:00
Hillel Coren
954c04c917 CRUD 2016-12-09 12:35:49 +02:00
Hillel Coren
d8ff4a3c05 CRUD 2016-12-09 11:51:18 +02:00
Hillel Coren
a0af7f4b96 CRUD 2016-12-09 11:26:21 +02:00
Hillel Coren
dc981b40ab CRUD 2016-12-09 10:54:34 +02:00
Hillel Coren
8b4c1d25da CRUD 2016-12-09 10:43:20 +02:00
Hillel Coren
e11a04f30f CRUD 2016-12-09 00:34:24 +02:00
Hillel Coren
07f76067e0 CRUD 2016-12-09 00:18:10 +02:00
Hillel Coren
da55195b8a CRUD 2016-12-09 00:06:31 +02:00
Hillel Coren
758e06b79b CRUD 2016-12-08 23:13:40 +02:00
Hillel Coren
249965df5c CRUD 2016-12-08 22:51:53 +02:00
Hillel Coren
ce4571a187 Working on CRUD 2016-12-08 22:39:15 +02:00
Hillel Coren
ce724fe1c9 Working on CRUD 2016-12-08 21:37:07 +02:00
Hillel Coren
6dc6658db1 Working on CRUD 2016-12-08 20:23:18 +02:00
Hillel Coren
8399f8b95f Working on module CRUD 2016-12-08 20:00:13 +02:00
Hillel Coren
bb55beaa64 Working on CRUD 2016-12-08 17:09:45 +02:00
Hillel Coren
2762debd59 Working on module CRUD 2016-12-08 15:41:35 +02:00
Hillel Coren
e0e88de8b3 Add alias for web to auth routes 2016-12-07 22:49:27 +02:00
Hillel Coren
4cde9f3d88 Show modules in main navigation 2016-12-07 22:40:36 +02:00
Hillel Coren
6f43f8d605 Add links to custom modules 2016-12-07 14:21:14 +02:00
Hillel Coren
dbdb9a0b4a Don't notify when paid invoices are viewed 2016-12-07 12:10:17 +02:00
Hillel Coren
4821908521 Fix for tests 2016-12-06 20:23:33 +02:00
Hillel Coren
d7ac1cd33b Fix for tests 2016-12-06 20:05:55 +02:00
Hillel Coren
3f29027ec2 Cleaned up routes file 2016-12-06 14:04:34 +02:00
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
Rowdy Klijnsmit
bb2eea035a Added new event listeners for Zapier 
* Add updated quote listener
* Add updated invoice listener
* Add deleted invoice listener
 2016-12-05 15:39:27 +01: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
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
0731165d8f Fix for payment buttons in HTML emails 2016-11-29 20:21:17 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
408aede80a Fix for JSON payment import 2016-11-28 10:55:00 +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
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
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
d53d7739b4 Fix for expense documents 2016-11-13 09:14:25 +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
bc8c24a67c Update checkdata script 2016-11-09 16:08:22 +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
Hillel Coren
522cabe0a1 Fix for permissions change 2016-10-28 09:42:49 +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
a4b919f188 Fix for tests 2016-10-27 12:56:21 +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
00d7df8850 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-26 10:32:44 +03:00
Hillel Coren
83c229028b Merge pull request #1113 from gpasztor87/develop 
Update User model
 2016-10-26 10:32:33 +03:00
Hillel Coren
b7c783aa15 Support sending API secret as header 2016-10-26 10:24:16 +03:00
David Bomba
0bef2a0d1a Changed object back to 2016-10-26 12:01:36 +11:00
Hillel Coren
3023eeb058 Fix for uploading multiple documents 2016-10-25 20:16:29 +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
c0a3971ca5 Store sidebar state in localstorage 2016-10-25 17:07:56 +03:00
Hillel Coren
12d9bac3fd Added fields for future features 2016-10-23 14:41:26 +03:00
Hillel Coren
6a55cf5b43 Add API support for expenses 2016-10-23 11:01:21 +03:00
Pásztor Gábor
3296fb344e Update User model 2016-10-22 20:13:37 +02:00
Hillel Coren
4320a72692 Add company plan to user account API response 2016-10-21 14:29:01 +03:00
Hillel Coren
fc683784fc Remove duplicate activity records for expenses and tasks 2016-10-21 09:54:28 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
040fb76a48 UI to apply white label license 2016-10-20 21:35:59 +03:00
Hillel Coren
d92f7fadc0 Fix for currency symbol 2016-10-20 18:14:54 +03:00
Hillel Coren
4c5b4d5164 Filter buy now clients and invoices 2016-10-20 17:50:59 +03:00
Hillel Coren
5560d65c4a Fix for currency symbol 2016-10-20 17:49:26 +03:00
Hillel Coren
5084e4c5b9 Fix for default currency symbol 2016-10-20 17:44:31 +03:00
Hillel Coren
a0f8475a35 Enable selecting currency symbol or code 2016-10-20 17:17:47 +03:00
Hillel Coren
4ed8246681 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-19 10:17:32 +03:00
Hillel Coren
b448f459f8 Fix task timer #1109 2016-10-19 10:17:23 +03:00
David Bomba
9c21cc0e5c Merge pull request #1110 from turbo124/develop 
Added missing fields in Expense Transformer
 2016-10-19 13:00:25 +11:00
David Bomba
c50f1a8f37 Added missing fields 2016-10-19 12:59:01 +11: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
Hillel Coren
9fe183f125 Fix for deleting vendor contacts 2016-10-18 14:22:04 +03:00
Hillel Coren
6c02ee2c60 Allow all users to see tax rates 2016-10-18 14:10:46 +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