312 Commits

Author	SHA1	Message	Date
Hillel Coren	8108e71cbc	Fix for attaching files	2016-07-14 12:59:15 +03:00
Hillel Coren	7438545aea	Bug fixes	2016-07-14 12:47:33 +03:00
Hillel Coren	abe5a8368d	Bumped version number to 2.6	2016-07-11 22:59:16 +03:00
Hillel Coren	986487b4c9	Working on new hosted pricing	2016-07-11 20:08:43 +03:00
Hillel Coren	6756fde908	Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream ... #583 add task creating editing to activity stream	2016-07-10 12:42:29 +03:00
Hillel Coren	cd9aae1e22	Working on expense categories	2016-07-06 21:35:16 +03:00
Holger Lösken	d1dc1a7e5b	Added tasks to activity on dashboard ... - Fixes #583 and resolves #583 - Creating and updating tasks creates an activity now - Each has its own event - The activity is shown on the dashboard	2016-07-05 16:31:57 +00:00
Holger Lösken	0fbda85a59	Code Refactoring ... - Removed unused uses - Type hinting for method parameters - Removed commented code - Introduced comments for classes and methods - Short array syntax	2016-07-03 16:19:22 +00:00
Hillel Coren	406249ef95	Payment webhook fixes	2016-06-24 15:40:10 +03:00
Hillel Coren	6ad49cf281	Fixing payment hooks	2016-06-23 16:15:52 +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
David Bomba	fedbd74319	Integrating Expense categories into API	2016-06-13 20:18:30 +10:00
Hillel Coren	ffa67cef3b	Refactoring payments code...	2016-06-09 10:56:22 +03:00
Hillel Coren	7facf518cf	Added back API route for quotes	2016-06-06 22:17:16 +03:00
Hillel Coren	706c26b4d5	Minor fixes	2016-06-05 21:05:11 +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	0c16d89540	Updated grandfathered user date	2016-06-04 23:22:05 +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	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
Hillel Coren	78bafbbf09	Support downloading PDF through the API	2016-06-01 12:56:15 +03:00
Hillel Coren	e7caa58d75	Changed route to use plurarl 'documents'	2016-05-30 13:43:41 +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	2043621ac9	Fix for deleting documents	2016-05-26 19:02:53 +03:00
Joshua Dwire	7d55ab033b	Merge branch 'wepay-ach' into wepay-integration	2016-05-25 11:11:47 -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	260b9212b9	Renamed PublicClientController to ClientPortalController	2016-05-23 11:31:49 +03:00
David Bomba	1e370d2cce	Implement DocumentAPIController	2016-05-21 18:44:53 +10:00
Hillel Coren	6caf1ff30d	Minor fixes	2016-05-19 09:47:57 +03:00
Hillel Coren	8be1771f47	Bumped version number	2016-05-18 10:12:33 +03: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	38866ff6f0	Disabled iOS push notifications by default	2016-05-17 14:35:16 +03:00
Hillel Coren	a82437b2bc	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Http/routes.php resources/lang/en/texts.php	2016-05-16 11:34:00 +03:00
Joshua Dwire	f6942a199f	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-15 21:21:59 -04:00
Hillel Coren	b067697b1c	Support manually importing OFX files	2016-05-15 13:58:11 +03:00
Joshua Dwire	d99d81d655	Make autobill setting numbers match token settings	2016-05-14 23:15:22 -04:00
Joshua Dwire	1524447cd4	WePay fixes; support account updater	2016-05-14 22:22:06 -04:00
Joshua Dwire	ce04c994dd	Support payments and storing cards via WePay.	2016-05-13 09:30:22 -04:00
Joshua Dwire	ba000546c4	Better WePay switching	2016-05-12 11:09:07 -04:00
Joshua Dwire	88c9fc1ac1	Add WePay configuration UI	2016-05-11 22:55:37 -04:00