784 Commits

Author	SHA1	Message	Date
Holger Lösken	1717028d36	Fixed wrong translation name, need to include the file "texts."	2016-06-30 15:21:03 +02:00
Holger Lösken	8b486ddfcc	Fix #203	2016-06-30 15:14:54 +02:00
Holger Lösken	ae78a177b0	Fix #562 ... Make „Manual entry“ translatable	2016-06-30 14:38:55 +02: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	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	718aa6a966	Web hook bug fixes	2016-06-23 17:05:50 +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	8a6227bf89	Fix for tests	2016-06-21 12:40:10 +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
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	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	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	a27b8173cb	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-06-06 19:31:56 +03:00
Joshua Dwire	0967ca65e8	Show "Credit Card" instead of "Stripe" as a payment option.	2016-06-05 15:07:02 -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
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	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	86a2dec504	Bug Fixes	2016-06-01 21:38:35 +10: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	17eb2a7a79	Support saving invoice_id and expense_id with the document	2016-06-01 12:39:42 +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
Hillel Coren	c061808677	Enabled uploading documents through the API	2016-05-30 13:44:49 +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	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
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	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
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	1f11d88d6b	Store ip addresses for payments and payment methods	2016-05-24 18:00:59 -04:00
Joshua Dwire	724f5738aa	Add contact_key	2016-05-24 17:02:28 -04:00
David Bomba	5f928ecf01	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-24 14:26:19 +10:00
Hillel Coren	e7bf0599db	Separated out entity datatable classes	2016-05-23 19:52:20 +03:00
Hillel Coren	260b9212b9	Renamed PublicClientController to ClientPortalController	2016-05-23 11:31:49 +03:00
Hillel Coren	f19058e35e	Improved message after update	2016-05-23 09:18:39 +03:00
Hillel Coren	86240affab	Show company name in client portal dashboard activities	2016-05-23 09:02:31 +03:00
Hillel Coren	371f224c24	Minor fixes for invoice export	2016-05-22 20:01:37 +03:00
Hillel Coren	d0232e00f6	Hide outstanding on dashboard from non-admins	2016-05-22 15:31:41 +03:00
David Bomba	1e370d2cce	Implement DocumentAPIController	2016-05-21 18:44:53 +10:00
David Bomba	eb1d5be47c	bugs in dashboardapicontroller	2016-05-21 09:17:53 +10:00
Hillel Coren	ef65bb7d84	Merge pull request #879 from joshuadwire/wepay-integration ... Wepay integration - Part 3	2016-05-18 19:22:44 +03:00
Joshua Dwire	f0d276be4c	Listen for WePay IPNs	2016-05-18 09:51:20 -04:00
Hillel Coren	2e1d340d27	Merge pull request #875 from joshuadwire/wepay-integration ... Wepay integration - Part 2	2016-05-17 22:25:59 +03:00
Joshua Dwire	4f3bb7eeb4	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-17 15:07:53 -04:00
Joshua Dwire	e905b29510	Partial WePay ACH support	2016-05-17 14:09:39 -04:00
Joshua Dwire	43fade2339	Support app fees and Canadian users	2016-05-17 11:32:17 -04:00
Hillel Coren	861672e9e9	Fix for deleting account	2016-05-17 15:05:07 +03:00