| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 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 |  | 
			
				
					| 
							
							
								 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 | 43fade2339 | Support app fees and Canadian users | 2016-05-17 11:32:17 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | faec0a2f04 | Fix for deleting account | 2016-05-17 15:03:17 +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 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5e7cdddc3e | Merge pull request #863 from joshuadwire/wepay-integration Wepay integration - Part 1 | 2016-05-16 11:29:37 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 1d05525ee3 | typo | 2016-05-16 12:30:24 +10:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f6942a199f | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-05-15 21:21:59 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | a482c63ee3 | Payments bug fixes | 2016-05-15 16:27:56 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3df6ad2529 | Changes to support transifex.com | 2016-05-15 23:16:08 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b067697b1c | Support manually importing OFX files | 2016-05-15 13:58:11 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9afd0741f7 | Better WePay setup UI | 2016-05-14 22:32:27 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 1524447cd4 | WePay fixes; support account updater | 2016-05-14 22:22:06 -04:00 |  |