Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc0a7cfbf0
							
						
					 | 
					
						
						
							
							Merge fixes from develop
						
						
						
						
						
						
					 | 
					
						2016-06-21 21:02:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							44d46a01ab
							
						
					 | 
					
						
						
							
							Always load user even if they're deleted
						
						
						
						
						
						
					 | 
					
						2016-06-08 08:11:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							bef4e5faea
							
						
					 | 
					
						
						
							
							Fix for quote number prefix
						
						
						
						
						
						
					 | 
					
						2016-06-07 16:45:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d472fcc93d
							
						
					 | 
					
						
						
							
							Check for blank api secret
						
						
						
						
						
						
					 | 
					
						2016-06-05 18:47:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							53eb0cb127
							
						
					 | 
					
						
						
							
							Fixed is_quote reference
						
						
						
						
						
						
					 | 
					
						2016-06-01 13:26:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1760d0e0e4
							
						
					 | 
					
						
						
							
							Prevent converting a qoute from incrementing the counter
						
						
						
						
						
						
					 | 
					
						2016-06-01 10:58:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							26b0169ae9
							
						
					 | 
					
						
						
							
							Fix permission issue with quotes
						
						
						
						
						
						
					 | 
					
						2016-05-26 15:51:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b0f086cbd
							
						
					 | 
					
						
						
							
							Only show user’s own tokens
						
						
						
						
						
						
					 | 
					
						2016-05-08 21:50:35 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							594b0e1bef
							
						
					 | 
					
						
						
							
							Implemented server-side analytics tracking for revenue
						
						
						
						
						
						
					 | 
					
						2016-05-08 16:54:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c67e66fb0
							
						
					 | 
					
						
						
							
							Sync ninja client when updating plan
						
						
						
						
						
						
					 | 
					
						2016-05-08 15:37:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							89b5d73615
							
						
					 | 
					
						
						
							
							Fix for loading tokens
						
						
						
						
						
						
					 | 
					
						2016-05-08 10:05:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7296c15730
							
						
					 | 
					
						
						
							
							Fix for footer font size in iOS mail
						
						
						
						
						
						
					 | 
					
						2016-05-06 15:54:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6971060049
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 19:25:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c79d9fe24c
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 17:46:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a5de605dc
							
						
					 | 
					
						
						
							
							Added relationLoaded checks to optimize queries
						
						
						
						
						
						
					 | 
					
						2016-05-05 10:15:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							db9d75ceff
							
						
					 | 
					
						
						
							
							Changed vendorcontacts to vendor_contacts
						
						
						
						
						
						
					 | 
					
						2016-05-04 15:16:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d878b6480
							
						
					 | 
					
						
						
							
							API optimizations
						
						
						
						
						
						
					 | 
					
						2016-05-03 23:02:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7f4368cbb
							
						
					 | 
					
						
						
							
							Working on permissions in the API
						
						
						
						
						
						
					 | 
					
						2016-05-02 16:12:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d6011caad
							
						
					 | 
					
						
						
							
							Working on permissions in the API
						
						
						
						
						
						
					 | 
					
						2016-05-02 11:38:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4db5a19885
							
						
					 | 
					
						
						
							
							Refactored API index methods
						
						
						
						
						
						
					 | 
					
						2016-05-01 23:55:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							933f2968d6
							
						
					 | 
					
						
						
							
							Working on form requests
						
						
						
						
						
						
					 | 
					
						2016-05-01 22:30:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							05bd8d9318
							
						
					 | 
					
						
						
							
							Moving permissions to form requests
						
						
						
						
						
						
					 | 
					
						2016-05-01 14:31:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c144a1c604
							
						
					 | 
					
						
						
							
							Fix to make it easier to test features
						
						
						
						
						
						
					 | 
					
						2016-05-01 11:43:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1000ff4088
							
						
					 | 
					
						
						
							
							Fix for currency formatting on invoice
						
						
						
						
						
						
					 | 
					
						2016-05-01 08:55:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc0d4d3edd
							
						
					 | 
					
						
						
							
							Finish migrating to Laravel ACL
						
						
						
						
						
						
					 | 
					
						2016-04-25 21:53:39 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf1b25b16
							
						
					 | 
					
						
						
							
							Begin adding authorization policies
						
						
						
						
						
						
					 | 
					
						2016-04-23 11:52:36 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DraperStudio
							
						 
					 | 
					
						
						
						
						
							
						
						
							d87552c90e
							
						
					 | 
					
						
						
							
							Use object_get to retrieve a config field
						
						
						
						
						
						
					 | 
					
						2016-04-20 13:37:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f31ab2eef1
							
						
					 | 
					
						
						
							
							Enable setting contact's public_id as id
						
						
						
						
						
						
					 | 
					
						2016-04-17 12:39:52 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3e9380c75
							
						
					 | 
					
						
						
							
							Fix for PhantomJS PDF when using iframe_url
						
						
						
						
						
						
					 | 
					
						2016-04-13 13:15:57 +03: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							13cec052b9
							
						
					 | 
					
						
						
							
							Merge pull request #788 from joshuadwire/attached-documents
						
						
						
						
						
						
						
						Fix invoicing of expenses 
						
						
					 | 
					
						2016-03-27 21:09:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							abe38ddba9
							
						
					 | 
					
						
						
							
							Fix invoicing of expenses
						
						
						
						
						
						
					 | 
					
						2016-03-27 13:09:59 -04: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 | 
					
					
						
						
							
							
							
						
					 |