| 
							
							
								 Hillel Coren | c9ef281206 | Merge pull request #819 from joshuadwire/enterprise-plan Fix typos in enterprise plan changes | 2016-04-19 23:44:14 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | eb91a3cd42 | Fix typos | 2016-04-19 16:31:50 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 0dcee794b5 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	resources/lang/en/texts.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/invoices/edit.blade.php | 2016-04-19 22:48:03 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 639a3c321a | Restrict documents to non-trial; allow resellers to override features | 2016-04-19 10:26:29 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 32d5a25f61 | Enabled specifying invoice padding | 2016-04-19 14:26:42 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9f5fe33059 | Added page size and live preview settings | 2016-04-19 10:51:57 +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 | 454e9bc861 | Refactor getPlanDetails | 2016-04-17 12:55:03 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 030d4ed4da | Fix renewals; fix plan edge cases | 2016-04-16 22:09:01 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e0568faae1 | Merge pull request #3 from joshuadwire/attached-documents Fix logo filesystem usage | 2016-04-16 19:17:34 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 33b8566d18 | Fix logo filesystem usage | 2016-04-16 19:14:43 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9b1bfef698 | Add support for multiple plans/terms | 2016-04-16 18:34:39 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 51cd82cba8 | Move cancel account to new account management page | 2016-04-16 10:58:53 -04:00 |  | 
			
				
					| 
							
							
								 Stefan Welsch | 56657f8f15 | Remove blank in email footer html tag In the email footer is an presentation error after the account name because of the blank in the ending p-tag.
I have removed the blank. | 2016-04-05 11:43:07 +02:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | d810ba7f6b | Improved document support | 2016-03-23 15:41:05 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 5640c74f35 | Migrate logos to use Laravel Filesystem | 2016-03-22 16:19:55 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c3c7f25b32 | Clarified partial labels | 2016-03-18 14:34:46 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4e9cc45a55 | Hide custom invoice line item fields if not pro | 2016-03-15 22:08:12 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 243b1c1d37 | Fix for JSON account export | 2016-03-13 13:56:56 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 44344e7676 | Added Japaense as a 'large font' | 2016-03-13 13:47:46 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4a749d5868 | Improvements to custom designer | 2016-02-25 20:34:23 +02:00 |  | 
			
				
					| 
							
							
								 David Bomba | 992802c164 | Working on API functionality | 2016-02-17 21:50:52 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 6d09bda646 | Working on API functionality | 2016-02-17 21:16:13 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7c3406d9e5 | Fix for #703 | 2016-02-15 19:58:18 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b5f817cf14 | Changed future white-label licenses to one year | 2016-02-11 21:27:58 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1794811f9b | Added two week trial for hosted pro plan | 2016-02-11 17:12:27 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8a9eb97134 | Working on enabling showing currency code | 2016-02-04 16:19:49 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 25b8c54355 | Bug: fix 'Invoice issued to' in business design for quote | 2016-02-03 22:19:15 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e9cacf2fdf | Added tax rates and localization to the API | 2016-02-03 16:03:56 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 021f195c45 | Implemented UpdateAccountRequest | 2016-02-03 14:41:40 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | efc9ab4f9e | Working on OFX support | 2016-01-26 22:22:33 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 91187eb06d | Bug fixes | 2016-01-23 20:36:11 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b24a6109ba | Working on expenses | 2016-01-21 21:15:30 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bf778aa616 | Initial work on OFX support | 2016-01-20 01:07:31 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 86f1e13c87 | Fix for #632 | 2016-01-18 16:09:06 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 74c636aef2 | Fix for #626 | 2016-01-13 23:38:15 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8cefa9a707 | Fixed problem with PDF preview after upgrading | 2016-01-13 08:18:26 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b5cf87bc0d | Bug fixes | 2016-01-12 11:18:35 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cf24684adb | Check user is pro to use custom fonts | 2016-01-11 14:50:17 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 904627e5b4 | Use buttons by default in styled emails | 2016-01-11 14:40:48 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d72ff27e62 | Improved invoice design form layout | 2016-01-10 20:40:04 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 08fd14a4c1 | Added a 'Live Preview' option when using a large font | 2016-01-10 16:22:40 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 77f9e89b40 | Added _id to header/body font properties | 2016-01-07 09:19:57 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 14192846e8 | Merging: custom font support | 2016-01-07 09:08:30 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7beeb78126 | Enabled updating/archiving invoice through the API | 2016-01-06 22:46:11 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 0140da0ae2 | Renamed client view to client portal | 2016-01-03 21:10:20 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 56330c1281 | Merge pull request #588 from joshuadwire/custom-css Add custom CSS support | 2016-01-03 14:45:16 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 35bb36fd34 | Bug fixes | 2015-12-31 12:23:39 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c2c51360dd | Fixes for #584 | 2015-12-31 10:04:12 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 565b26ba27 | Bug fixes | 2015-12-30 20:45:52 +02:00 |  |