Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity
3,665 Commits 9 Branches 921 Tags 2 GiB
bb590830cf
Commit Graph

2250 Commits

Author SHA1 Message Date
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
c1713c190c Fix for go pro process 2016-06-28 21:21:54 +03:00
Hillel Coren
af4cb1dac8 Fix for client portal header navigation 2016-06-26 19:48:15 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
15781ff895 Payment token fixes 2016-06-26 13:45:50 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren
406249ef95 Payment webhook fixes 2016-06-24 15:40:10 +03:00
Hillel Coren
d71017e203 Payment webhook bug fixes 2016-06-23 20:17:02 +03:00
Hillel Coren
718aa6a966 Web hook bug fixes 2016-06-23 17:05:50 +03:00
Hillel Coren
74a0deb07e Web hook bug fixes 2016-06-23 16:27:54 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
1fc1c11663 API changes for Zapier 2016-06-23 12:58:28 +03:00
Hillel Coren
4281a1c3b0 API changes for Zapier 2016-06-23 12:57:10 +03:00
Hillel Coren
e36d23fcdc API changes for Zapier 2016-06-23 12:39:07 +03:00
Hillel Coren
725522ea21 API changes for Zapier 2016-06-23 12:38:06 +03:00
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
dcdfb4f21c Check to prevent duplicate gateways 2016-06-22 20:13:45 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Hillel Coren
fc0a7cfbf0 Merge fixes from develop 2016-06-21 21:02:01 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
David Bomba
e540e98c80 Add company logo_url to UserAccount Transformer 2016-06-21 19:50:26 +10:00
Hillel Coren
8a6227bf89 Fix for tests 2016-06-21 12:40:10 +03:00
Hillel Coren
3e068be315 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-21 12:31:47 +03:00
David Bomba
aa3e8e7c67 Merge pull request #924 from turbo124/develop 
Add company logo to UserAccount Transformer
 2016-06-21 19:23:17 +10:00
David Bomba
851b3e963c Add company logo to UserAccount Transformer 2016-06-21 19:21:50 +10:00
Hillel Coren
a2c7a0c12f Improvement to Eway payment process 2016-06-21 12:07:16 +03:00
Hillel Coren
b06b437e27 Fix for tests 2016-06-20 22:26:48 +03:00
Hillel Coren
12b754dc32 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-20 17:14:57 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
vincentdh
5875b70496 Add Mailgun API as mail driver 
Add Mailgun API as a mail driver.  Can be configured from the System
Settings page.
 2016-06-19 13:51:22 -04:00
David Bomba
5fdfa8c466 Add logo into Transformer 2016-06-18 17:56:09 +10:00
David Bomba
abafc4ce6f typo 2016-06-13 20:29:43 +10:00
David Bomba
6e57976075 typo 2016-06-13 20:26:47 +10:00
David Bomba
369b696297 typo 2016-06-13 20:23:14 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
David Bomba
7237f25cba Expense Category Transformer 2016-06-13 20:05:28 +10:00
David Bomba
f6aa3340d7 Expense Categories Model 2016-06-11 12:47:26 +10:00
Hillel Coren
e2e629141b Refresh contacts after saving in API 2016-06-09 15:22:57 +03:00
Hillel Coren
bcbb68372e Refresh contacts after saving in API 2016-06-09 15:21:33 +03:00
Hillel Coren
5e374b2859 Refresh contacts after saving in API 2016-06-09 15:20:15 +03:00
Hillel Coren
1a9f7bf098 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-09 10:56:31 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
31fc4ad59c Merge pull request #911 from haleksandre/invoice-subtotals 
Add custom labelling and style to multiple labels and amount in the subtotals table
 2016-06-09 09:05:57 +03:00
Alexandre Villeneuve
eafdc12fa5 Add style to multiple subtotals labels 2016-06-08 14:00:44 -04:00
Hillel Coren
40241cbf38 Restrict client list 2016-06-08 17:56:48 +03:00
Hillel Coren
f67990d636 Restrict client list 2016-06-08 17:56:13 +03:00
Hillel Coren
3c9e2769fb Merge fix for outstanding balance on dashboard 2016-06-08 17:21:02 +03:00
Hillel Coren
d9a20ca445 Fix for analytics 2016-06-08 16:07:08 +03:00
Hillel Coren
08c01f59d6 Fix for analytics 2016-06-08 16:06:48 +03:00
Hillel Coren
44d46a01ab Always load user even if they're deleted 2016-06-08 08:11:48 +03:00
Hillel Coren
1039aec1d0 Always load user even if they're deleted 2016-06-08 08:11:05 +03:00
Hillel Coren
de4e79f537 Fix for invoice report totals 2016-06-07 21:50:09 +03:00
Hillel Coren
13fbb880e1 Fix for invoice report totals 2016-06-07 21:49:20 +03:00
Hillel Coren
4976d5b057 Fix for tests 2016-06-07 21:13:29 +03:00
Hillel Coren
2a109cbfbc Removing log messages 2016-06-07 18:00:30 +03:00
Hillel Coren
7e1a0634f5 Working on tests 2016-06-07 17:55:52 +03:00
Hillel Coren
be11054b31 Working on tests 2016-06-07 17:39:18 +03:00
Hillel Coren
cc55cdc1b5 Working on tests 2016-06-07 17:29:26 +03:00
Hillel Coren
bef4e5faea Fix for quote number prefix 2016-06-07 16:45:21 +03:00
Hillel Coren
5489ade5ff Fix for tests 2016-06-07 14:40:54 +03:00
Hillel Coren
f4fcc81871 Fix for tests 2016-06-07 14:39:53 +03:00
Hillel Coren
1e837c2368 Clarified/documented refund logic 2016-06-07 10:54:20 +03:00
Hillel Coren
7730904bda Added back API route for quotes 2016-06-06 22:19:49 +03:00
Hillel Coren
1eb334f3b4 Added back API route for quotes 2016-06-06 22:18:15 +03:00
Hillel Coren
7facf518cf Added back API route for quotes 2016-06-06 22:17:16 +03:00
Hillel Coren
a27b8173cb Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-06 19:31:56 +03:00
Hillel Coren
80202b6d92 Added support for searching by invoice number in the API 2016-06-06 19:04:57 +03:00
Hillel Coren
d032ae00fc Added support for searching by invoice number in the API 2016-06-06 19:04:24 +03:00
Joshua Dwire
0967ca65e8 Show "Credit Card" instead of "Stripe" as a payment option. 2016-06-05 15:07:02 -04:00
Joshua Dwire
5eb76df20e Fix refunds on Stripe 2016-06-05 15:06:34 -04:00
Hillel Coren
d5669fdbf9 Minor fixes 2016-06-05 21:08:41 +03:00
Hillel Coren
706c26b4d5 Minor fixes 2016-06-05 21:05:11 +03:00
Hillel Coren
85d94b5a36 Minor fixes 2016-06-05 19:11:37 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
8b2f7eb39f Check for blank api secret 2016-06-05 18:50:41 +03:00
Hillel Coren
d472fcc93d Check for blank api secret 2016-06-05 18:47:51 +03:00
David Bomba
d27219a6a0 refactoring documentAPI 2016-06-05 20:15:49 +10:00
David Bomba
d5c2fc81bd refactoring documentAPI 2016-06-05 20:13:38 +10:00
David Bomba
8ff41dfc7e refactoring documentAPI 2016-06-05 20:12:21 +10:00
David Bomba
1617be2485 refactoring documentAPI 2016-06-05 20:00:21 +10:00
Hillel Coren
4c8414f616 git update 2016-06-05 08:24:16 +03:00
Hillel Coren
02a6213e34 Updated grandfathered user date 2016-06-04 23:22:27 +03:00
Hillel Coren
0c16d89540 Updated grandfathered user date 2016-06-04 23:22:05 +03:00
Hillel Coren
73a1c6a6e3 Fix for error in Authenticate.php 2016-06-04 23:02:18 +03:00
Hillel Coren
e80af4a95d Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-03 11:23:07 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +03:00
Hillel Coren
d3372680cf Include archived records in JSON export 2016-06-03 11:17:55 +03:00
Hillel Coren
619938bc72 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-02 22:04:12 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
David Bomba
2a39fee1c6 Merge pull request #900 from turbo124/develop 
Develop
 2016-06-01 21:39:36 +10:00
David Bomba
f727e4669d Merge branch 'develop' of https://github.com/turbo124/invoiceninja into develop 2016-06-01 21:38:45 +10:00
David Bomba
86a2dec504 Bug Fixes 2016-06-01 21:38:35 +10:00
David Bomba
8b781746fe Update DocumentTransformer.php 2016-06-01 21:36:27 +10:00
David Bomba
7073343756 Update DocumentTransformer.php 2016-06-01 21:35:53 +10:00
Hillel Coren
53eb0cb127 Fixed is_quote reference 2016-06-01 13:26:59 +03:00
David Bomba
671b3ba02a test 2016-06-01 20:15:31 +10:00
David Bomba
f239cfdfb4 bug fixes 2016-06-01 20:03:19 +10:00
Hillel Coren
e08e8c1962 Support downloading PDF through the API 2016-06-01 12:56:59 +03:00
Hillel Coren
78bafbbf09 Support downloading PDF through the API 2016-06-01 12:56:15 +03:00
Hillel Coren
b0f8385a25 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-01 12:39:57 +03:00
Hillel Coren
17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
Hillel Coren
1760d0e0e4 Prevent converting a qoute from incrementing the counter 2016-06-01 10:58:03 +03:00
Hillel Coren
51d9b2b427 Prevent converting a qoute from incrementing the counter 2016-06-01 10:56:44 +03:00
Hillel Coren
e6a05509b1 Enabled importing products 2016-05-31 23:16:05 +03:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
c122987bc7 Enabled santizing input before validation 2016-05-31 23:15:37 +03:00
David Bomba
fc0d9f13a8 bug fixes 2016-05-31 20:04:30 +10:00
David Bomba
3a98f6ffdc bug fixes on API Dashboard 2016-05-31 20:03:52 +10:00
David Bomba
47d31b24fd testing 2016-05-31 20:02:41 +10:00
David Bomba
5422f182c2 testing 2016-05-31 20:00:23 +10:00
David Bomba
33a3ce2f39 testing 2016-05-31 19:59:04 +10:00
David Bomba
0659ce55ac testing 2016-05-31 19:58:01 +10:00
David Bomba
b7c99335fd testing 2016-05-31 19:54:57 +10:00
David Bomba
30a281110f Logging Document uploads 2016-05-31 15:01:43 +10:00
rafael.sisweb
db89a574f6 Add missing use Utils 2016-05-30 12:30:57 -04:00
Hillel Coren
c061808677 Enabled uploading documents through the API 2016-05-30 13:44:49 +03:00
Hillel Coren
e7caa58d75 Changed route to use plurarl 'documents' 2016-05-30 13:43:41 +03:00
Hillel Coren
2f3c309d41 Remove fallback support for dropzone 2016-05-30 11:51:41 +03:00
Hillel Coren
d175fc872a Don't render pdf if not attached and fix typo 2016-05-29 19:32:45 +03:00
Hillel Coren
ced3daf9c6 Added clear commands when updating 2016-05-29 17:49:09 +03:00
Hillel Coren
38cd6de8da Added clear commands when updating 2016-05-29 17:48:55 +03:00
Hillel Coren
2f1d53d9b3 Enable mobile app for non-pro users 2016-05-29 17:32:08 +03:00
Hillel Coren
8d0bed3754 Enable mobile app for non-pro users 2016-05-29 17:31:03 +03:00
Hillel Coren
8df844ea26 Fix for quotes list action dropdown 2016-05-29 15:45:37 +03:00
Hillel Coren
a9302d4d01 Fixes for is_quote 2016-05-29 15:34:44 +03:00
Hillel Coren
59d0a1cb80 Fix to support mobile app 2016-05-29 14:22:25 +03:00
Hillel Coren
607fb58c29 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Models/Account.php
 2016-05-29 12:27:14 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types 
add support to multiple invoice types
 2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
1c119fe35a ACH autobill bug fixes 2016-05-26 15:22:09 -04:00
Hillel Coren
145c394e6b Ensure all files are deleted with the account 2016-05-26 20:48:45 +03:00
Hillel Coren
f233582ea8 Ensure all files are deleted with the account 2016-05-26 20:48:27 +03:00
Hillel Coren
b32a9110c7 Fix for deleting documents 2016-05-26 19:04:43 +03:00
Hillel Coren
2043621ac9 Fix for deleting documents 2016-05-26 19:02:53 +03:00
Hillel Coren
7599edbc8c Fixed date formatting in document list 2016-05-26 18:28:36 +03:00
Hillel Coren
0da3741b56 Fixed date formatting in document list 2016-05-26 18:28:13 +03:00
Hillel Coren
26b0169ae9 Fix permission issue with quotes 2016-05-26 15:51:13 +03:00
Hillel Coren
29bccd650d Fix permission issue with quotes 2016-05-26 15:50:23 +03:00
Joshua Dwire
acbc0e887f Support adding WePay ACH from payment page 2016-05-25 16:54:49 -04:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Hillel Coren
afd7b7ed38 check document completed upload before user submitted form 2016-05-25 21:44:06 +03:00
Hillel Coren
85184f9a5b check document completed upload before user submitted form 2016-05-25 21:42:22 +03:00
Joshua Dwire
7d55ab033b Merge branch 'wepay-ach' into wepay-integration 2016-05-25 11:11:47 -04:00
Joshua Dwire
d19a3715f9 Warn user when editing an ACH auto bill invoice 2016-05-25 11:07:20 -04:00
Joshua Dwire
c701c5563c Add payment settings block 2016-05-25 10:36:40 -04:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Joshua Dwire
a5fdb88d79 Add support for auto bill on due date 2016-05-24 22:49:06 -04:00