| 
							
							
								 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 | 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 | ce04c994dd | Support payments and storing cards via WePay. | 2016-05-13 09:30:22 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 88c9fc1ac1 | Add WePay configuration UI | 2016-05-11 22:55:37 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fec948f1e8 | Fixed searching for non-admins | 2016-05-08 21:29:49 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5249ae0291 | Added Pakistani Rupee | 2016-05-05 22:49:09 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 2fcb1d66a5 | Fix for travis tests | 2016-05-04 09:53:43 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 75ee124626 | Fix for TD Bank w/OFX | 2016-05-03 14:05:35 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e7f4368cbb | Working on permissions in the API | 2016-05-02 16:12:37 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9979eba5d9 | Working on custom route model binding | 2016-04-28 15:16:33 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 22f65e8108 | Finalize multi-plan support * Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts | 2016-04-18 22:35:18 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9b1bfef698 | Add support for multiple plans/terms | 2016-04-16 18:34:39 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b0a4a9b31c | Cleaning up log files | 2016-03-22 17:14:40 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5c1e9900d3 | Fix for #779 | 2016-03-22 16:37:14 +02:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0148d06205 | Add user permission support | 2016-03-15 19:08:00 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b29c795d93 | Updated OFX library APPID and APPVER to QWIN 2500 | 2016-03-11 11:52:57 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 52d25192af | Added warning if cache isn't set | 2016-03-07 17:22:20 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b719f243c2 | Fix for #751 | 2016-03-03 22:24:27 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 41ed55c9b5 | Made dataviz bars wider | 2016-02-27 22:51:22 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1c864f4304 | Added tax report | 2016-02-23 23:32:39 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c9f38699d2 | Updated Travis config | 2016-02-22 21:58:16 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 826d1b868b | Enable auto renewing and updated Travis config | 2016-02-22 21:23:15 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1529b59235 | Prevent product without product key | 2016-02-19 11:15:35 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fed9078c42 | Travis... | 2016-02-18 23:05:30 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 049c20f062 | Zapier improvements | 2016-02-16 17:30:09 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1794811f9b | Added two week trial for hosted pro plan | 2016-02-11 17:12:27 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 02f137f95f | Implemented StackTraceJS | 2016-01-31 21:36:50 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1ac12e1506 | Added basic stats for resellers | 2016-01-28 14:04:55 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | efc9ab4f9e | Working on OFX support | 2016-01-26 22:22:33 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 360b59baa0 | Working on expenses | 2016-01-22 00:29:10 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | dff7ad91c8 | Merge: Bugfixed version of Vendor / Expense module (#635) | 2016-01-21 00:09:10 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9287118cd0 | Merging: Bugfixed version of Vendor / Expense module #635 | 2016-01-20 16:06:17 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bf778aa616 | Initial work on OFX support | 2016-01-20 01:07:31 +02:00 |  | 
			
				
					| 
							
							
								 steenrabol | e7a658aaf6 | Expenses bug fix | 2016-01-19 14:01:19 +01:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 332e4984c4 | Show currency code after amount | 2016-01-18 16:35:05 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cbe2b2905e | Added autolink to emails and fixed checkout.com integration | 2016-01-18 10:30:42 +02:00 |  | 
			
				
					| 
							
							
								 steenrabol | 6133c6ff07 | Merge branch 'master' of https://github.com/invoiceninja/invoiceninja # Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php | 2016-01-11 20:39:18 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | 9050c8790e | Bug Fixes | 2016-01-08 09:56:06 +11:00 |  | 
			
				
					| 
							
							
								 steenrabol | dba3a39559 | Vendor management | 2016-01-06 15:23:58 +01:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | debc22d7d2 | Bug fixes | 2015-12-31 13:31:50 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 372ffb0ea9 | Bug fixes | 2015-12-17 10:19:56 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 08a4c4dcb4 | Added email settings page | 2015-12-15 22:25:12 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e893d74b41 | Added company website | 2015-12-14 23:05:17 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 19d5d49e63 | Working on #427 | 2015-12-13 22:12:54 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6fc8f76ea8 | Working on data import | 2015-12-08 12:10:20 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1a474f362f | Added support for country specific Euro formatting | 2015-12-07 15:34:55 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c5a1abf66f | Added HTML email designs | 2015-12-02 15:26:06 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 72d906d6d2 | Auto increment invoice number counter | 2015-11-29 12:41:32 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cf458c52a2 | Working on the API | 2015-11-27 14:55:28 +02:00 |  |