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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							947cb4a6f7
							
						
					 | 
					
						
						
							
							Better WePay configuration support
						
						
						
						
						
						
					 | 
					
						2016-05-14 17:23:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							3202d2480f
							
						
					 | 
					
						
						
							
							Fix for saving client portal setting in self host
						
						
						
						
						
						
					 | 
					
						2016-05-12 20:26:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba000546c4
							
						
					 | 
					
						
						
							
							Better WePay switching
						
						
						
						
						
						
					 | 
					
						2016-05-12 11:09:07 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							41f4c98e08
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into payments-changes
						
						
						
						
						
						
					 | 
					
						2016-05-10 10:25:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							fec948f1e8
							
						
					 | 
					
						
						
							
							Fixed searching for non-admins
						
						
						
						
						
						
					 | 
					
						2016-05-08 21:29:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6971060049
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 19:25:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							bce4395f82
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 17:51:52 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c79d9fe24c
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 17:46:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8170f0324
							
						
					 | 
					
						
						
							
							Support refunds from the admin UI
						
						
						
						
						
						
					 | 
					
						2016-04-23 16:40:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf75a2c2d2
							
						
					 | 
					
						
						
							
							Merge pull request #823 from joshuadwire/enterprise-plan
						
						
						
						
						
						
						
						Fix refunds; support using stored card; change proPlanModel link 
						
						
					 | 
					
						2016-04-21 10:39:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d27b68fb6
							
						
					 | 
					
						
						
							
							Fix refunds; support using stored card; change proPlanModel link
						
						
						
						
						
						
					 | 
					
						2016-04-20 16:53:56 -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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6fa4620b9
							
						
					 | 
					
						
						
							
							Fix for links when public/ is in URL
						
						
						
						
						
						
					 | 
					
						2016-04-13 12:57:03 +03: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3c7f25b32
							
						
					 | 
					
						
						
							
							Clarified partial labels
						
						
						
						
						
						
					 | 
					
						2016-03-18 14:34:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0148d06205
							
						
					 | 
					
						
						
							
							Add user permission support
						
						
						
						
						
						
					 | 
					
						2016-03-15 19:08:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed7cbf1d2b
							
						
					 | 
					
						
						
							
							Support searching by custom client fields
						
						
						
						
						
						
					 | 
					
						2016-03-14 10:09:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6aafb9154d
							
						
					 | 
					
						
						
							
							Enabled registering through the API
						
						
						
						
						
						
					 | 
					
						2016-03-08 23:22:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0d30e1e26
							
						
					 | 
					
						
						
							
							Add support for including password in email; include portal customizations
						
						
						
						
						
						
					 | 
					
						2016-03-05 18:09:50 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							903904d423
							
						
					 | 
					
						
						
							
							Merge Laravel 5.2 upgrade
						
						
						
						
						
						
					 | 
					
						2016-03-03 21:57:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							aef4c6be98
							
						
					 | 
					
						
						
							
							Upgrade to Laravel 5.2
						
						
						
						
						
						
					 | 
					
						2016-03-02 15:36:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b5311e960
							
						
					 | 
					
						
						
							
							Added setting to show/hide client portal dashboard
						
						
						
						
						
						
					 | 
					
						2016-03-01 09:36:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							6376302ed9
							
						
					 | 
					
						
						
							
							Add option for client portal password
						
						
						
						
						
						
					 | 
					
						2016-02-29 16:46:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							553c548f31
							
						
					 | 
					
						
						
							
							Enabled setting recurring invoice number prefix
						
						
						
						
						
						
					 | 
					
						2016-02-28 20:36:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2153a8e227
							
						
					 | 
					
						
						
							
							Added custom invoice item fields
						
						
						
						
						
						
					 | 
					
						2016-02-28 13:59:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a749d5868
							
						
					 | 
					
						
						
							
							Improvements to custom designer
						
						
						
						
						
						
					 | 
					
						2016-02-25 20:34:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b64910c9d
							
						
					 | 
					
						
						
							
							Prevent reloading page when showing/hiding archived
						
						
						
						
						
						
					 | 
					
						2016-02-18 20:14:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							25d2af4891
							
						
					 | 
					
						
						
							
							Working on download PDF route
						
						
						
						
						
						
					 | 
					
						2016-02-17 17:50:01 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b3e35687a
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-02-04 16:12:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							021f195c45
							
						
					 | 
					
						
						
							
							Implemented UpdateAccountRequest
						
						
						
						
						
						
					 | 
					
						2016-02-03 14:41:40 +02:00 | 
					
					
						
						
							
							
							
						
					 |