830 Commits

Author	SHA1	Message	Date
David Bomba	1617be2485	refactoring documentAPI	2016-06-05 20:00:21 +10: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	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	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
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
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	38cd6de8da	Added clear commands when updating	2016-05-29 17:48:55 +03:00
Hillel Coren	8d0bed3754	Enable mobile app for non-pro users	2016-05-29 17:31:03 +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	f233582ea8	Ensure all files are deleted with the account	2016-05-26 20:48:27 +03:00
Hillel Coren	2043621ac9	Fix for deleting documents	2016-05-26 19:02:53 +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	29c4f16970	Fix contact authentication	2016-05-24 17:45:38 -04:00
Joshua Dwire	724f5738aa	Add contact_key	2016-05-24 17:02:28 -04:00
Hillel Coren	ea2f154b1f	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-24 10:18:21 +03:00
Hillel Coren	7cc29de881	Bumped version	2016-05-24 10:18:10 +03:00
David Bomba	5f928ecf01	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-24 14:26:19 +10:00
Hillel Coren	541b19cd5f	Updated vendor expenses to new datatable class	2016-05-23 21:03:01 +03: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