| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Hillel Coren | d07fec5d62 | Fix for #816 preg_match() error on settings update | 2016-04-19 21:46:18 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fb975db1f2 | Merge pull request #815 from joshuadwire/enterprise-plan Enterprise plan bug fixes | 2016-04-19 17:40:17 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0fd39e5be0 | Only allow pro trials | 2016-04-19 10:28:27 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 32d5a25f61 | Enabled specifying invoice padding | 2016-04-19 14:26:42 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cd52faa3bf | Automatically disable live preview when using a large font | 2016-04-19 14:12:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a805e2b8bb | Merge pull request #814 from joshuadwire/enterprise-plan Enterprise plan | 2016-04-19 12:01:56 +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 |  | 
			
				
					| 
							
							
								 Hillel Coren | af5b5f4458 | Improve report name | 2016-04-17 13:08:58 +03: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 |  | 
			
				
					| 
							
							
								 Hillel Coren | 82c599683a | Hid converted quotes from the dashboard | 2016-04-14 16:08:28 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9b8b150766 | Implemented enable_client_portal_dashboard | 2016-04-13 22:08:41 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3cb3126f98 | Hide sample document from invoice design page | 2016-04-13 21:50:54 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d7508d2de4 | Use invoice transformer with quote | 2016-04-13 21:45:08 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b6fa4620b9 | Fix for links when public/ is in URL | 2016-04-13 12:57:03 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3303c00067 | Fix for Cybersource | 2016-04-11 22:09:05 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d4915074b6 | Fix for quotes | 2016-04-11 11:44:53 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 43ed09206e | Fixed payment list in client portal | 2016-04-10 22:54:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c08d0bb98a | Added support for currency_code in invoice API | 2016-04-10 21:48:32 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 2bb56c9661 | Fix for permissions on dashboard | 2016-04-10 15:49:45 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 769465542d | Show info icon as orange if invitation opened but not viewed | 2016-04-09 23:36:32 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8b0ef8e8ea | Fixes #798 Setup error | 2016-04-09 23:00:24 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fdde60577c | Fixed problem creating a new payment gateway | 2016-04-08 10:38:11 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | be9e7beaed | Support for multiple tax rates | 2016-03-31 12:29:01 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | f91f32323f | Reworking taxes | 2016-03-29 17:30:28 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8bb0d3154f | Hide deleted records from the charts | 2016-03-29 17:29:16 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d2d22fbb50 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	resources/views/invoices/knockout.blade.php | 2016-03-27 18:20:48 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d70bc4e922 | Support multiple tax rates | 2016-03-27 18:06:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c076f2887c | Merge pull request #785 from joshuadwire/attached-documents Add support for attached documents | 2016-03-27 18:04:09 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7a929a51bb | Added back .env variables #787 | 2016-03-27 17:39:26 +03:00 |  | 
			
				
					| 
							
							
								 vincentdh | 690ebf853f | Update AppController.php Modify the doSetup() to use a similar way to create the .env file and add quotes when needed. | 2016-03-26 12:52:21 -04:00 |  | 
			
				
					| 
							
							
								 vincentdh | 965ef011e5 | Update AppController.php | 2016-03-26 12:49:22 -04:00 |  | 
			
				
					| 
							
							
								 vincentdh | 2c6e9aced3 | Update AppController.php Add quotes to MAIL_FROM_NAME when needed | 2016-03-26 12:34:39 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | b5a948583e | Remove debug code and fix minor bugs | 2016-03-24 19:55:56 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 5e62d7d296 | Allow documents to be attached to expenses | 2016-03-24 18:15:52 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | bff6782026 | Add support for uploading documents on older browsers | 2016-03-24 15:13:54 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | cd8290946e | Add client portal documents tab | 2016-03-24 11:58:30 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 1c5c45a1e1 | Improved handling of various document types; better documents zip | 2016-03-24 11:33:28 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e6056104bd | Display documents and zip download on client invoice page | 2016-03-23 22:41:19 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 2a7e8cb4b7 | Add documents placeholder for emails | 2016-03-23 21:25:33 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 10fa256809 | Use stream when downloading documents | 2016-03-23 20:46:09 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f7d8f819b6 | Add option to attach documents to invoice email | 2016-03-23 19:20:08 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 942f543bbb | Display documents in invoice PDF | 2016-03-23 18:40:42 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | d810ba7f6b | Improved document support | 2016-03-23 15:41:05 -04:00 |  |