Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9302d4d01
							
						
					 | 
					
						
						
							
							Fixes for is_quote
						
						
						
						
						
						
					 | 
					
						2016-05-29 15:34:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ben
							
						 
					 | 
					
						
						
						
						
							
						
						
							dadac05532
							
						
					 | 
					
						
						
							
							add support to multiple invoice types
						
						
						
						
						
						
					 | 
					
						2016-05-29 12:02:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							41f4c98e08
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into payments-changes
						
						
						
						
						
						
					 | 
					
						2016-05-10 10:25:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							20f6f32a06
							
						
					 | 
					
						
						
							
							Update UI for configuring auto bill
						
						
						
						
						
						
					 | 
					
						2016-05-09 16:29:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							594b0e1bef
							
						
					 | 
					
						
						
							
							Implemented server-side analytics tracking for revenue
						
						
						
						
						
						
					 | 
					
						2016-05-08 16:54:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6971060049
							
						
					 | 
					
						
						
							
							Added preview for email templates
						
						
						
						
						
						
					 | 
					
						2016-05-05 19:25:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1000ff4088
							
						
					 | 
					
						
						
							
							Fix for currency formatting on invoice
						
						
						
						
						
						
					 | 
					
						2016-05-01 08:55:59 +03: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3e9380c75
							
						
					 | 
					
						
						
							
							Fix for PhantomJS PDF when using iframe_url
						
						
						
						
						
						
					 | 
					
						2016-04-13 13:15:57 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e62d7d296
							
						
					 | 
					
						
						
							
							Allow documents to be attached to expenses
						
						
						
						
						
						
					 | 
					
						2016-03-24 18:15:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							88808d44bf
							
						
					 | 
					
						
						
							
							Add support for invoice attachments
						
						
						
						
						
						
					 | 
					
						2016-03-22 22:23:45 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2153a8e227
							
						
					 | 
					
						
						
							
							Added custom invoice item fields
						
						
						
						
						
						
					 | 
					
						2016-02-28 13:59:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							01f9634237
							
						
					 | 
					
						
						
							
							Improvements to data export
						
						
						
						
						
						
					 | 
					
						2016-02-25 11:25:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1d13cc84c
							
						
					 | 
					
						
						
							
							Improvements to the tax report
						
						
						
						
						
						
					 | 
					
						2016-02-24 22:58:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c864f4304
							
						
					 | 
					
						
						
							
							Added tax report
						
						
						
						
						
						
					 | 
					
						2016-02-23 23:32:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed941fef89
							
						
					 | 
					
						
						
							
							Enabled downloading PDF through route
						
						
						
						
						
						
					 | 
					
						2016-02-17 21:13:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							331b117189
							
						
					 | 
					
						
						
							
							Fix for #713
						
						
						
						
						
						
					 | 
					
						2016-02-17 20:59:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							25d2af4891
							
						
					 | 
					
						
						
							
							Working on download PDF route
						
						
						
						
						
						
					 | 
					
						2016-02-17 17:50:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							aef4658873
							
						
					 | 
					
						
						
							
							Api work/Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-02-17 19:10:33 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3ee79f369
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:44:01 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							7da522599c
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:36:45 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cd3bac29c
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:35:54 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a953c5bcb
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:34:23 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e4df4ff4f
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:29:18 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							09650123d7
							
						
					 | 
					
						
						
							
							Improving error reporting API
						
						
						
						
						
						
					 | 
					
						2016-02-17 10:05:08 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccaabe2926
							
						
					 | 
					
						
						
							
							working on payments API
						
						
						
						
						
						
					 | 
					
						2016-02-07 22:01:39 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							42f3cffca8
							
						
					 | 
					
						
						
							
							Delete a payment from the API
						
						
						
						
						
						
					 | 
					
						2016-02-07 21:24:21 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							387f89440c
							
						
					 | 
					
						
						
							
							Add Header/Footer options to invoice design settings
						
						
						
						
						
						
					 | 
					
						2016-01-31 23:42:20 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							6166464003
							
						
					 | 
					
						
						
							
							Merge: Make automatic conversion of quote to invoice optional (#636)
						
						
						
						
						
						
					 | 
					
						2016-01-20 10:41:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fdea0fe95
							
						
					 | 
					
						
						
							
							Fixes #627
						
						
						
						
						
						
					 | 
					
						2016-01-14 23:28:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac58df4441
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-01-13 11:09:00 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								steenrabol
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e9e28f06f
							
						
					 | 
					
						
						
							
							Expense module
						
						
						
						
						
						
					 | 
					
						2016-01-10 11:25:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							14192846e8
							
						
					 | 
					
						
						
							
							Merging: custom font support
						
						
						
						
						
						
					 | 
					
						2016-01-07 09:08:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e98e9b60d
							
						
					 | 
					
						
						
							
							Merge pull request #594 from joshuadwire/more-payment-terms
						
						
						
						
						
						
						
						Add due date settings for recurring invoices 
						
						
					 | 
					
						2016-01-06 12:07:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							f66539b0da
							
						
					 | 
					
						
						
							
							Integrate Payments into API
						
						
						
						
						
						
					 | 
					
						2016-01-05 23:51:27 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e336ec118
							
						
					 | 
					
						
						
							
							Add due date settings for recurring invoices
						
						
						
						
						
						
						
						* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text 
						
						
					 | 
					
						2015-12-31 23:59:02 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							debc22d7d2
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-12-31 13:31:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ead34fef0
							
						
					 | 
					
						
						
							
							Enabled setting reminder before/after due date or invoice date
						
						
						
						
						
						
					 | 
					
						2015-12-28 12:15:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							991b19b2a2
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-12-24 13:17:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4dc7a8d5f1
							
						
					 | 
					
						
						
							
							Working on email markup
						
						
						
						
						
						
					 | 
					
						2015-12-16 13:49:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							19d5d49e63
							
						
					 | 
					
						
						
							
							Working on #427
						
						
						
						
						
						
					 | 
					
						2015-12-13 22:12:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							68bb3c8a82
							
						
					 | 
					
						
						
							
							Added .env field for MySQL strict mode
						
						
						
						
						
						
					 | 
					
						2015-11-29 12:12:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							64fec3b502
							
						
					 | 
					
						
						
							
							Updated to phantomjscloud v2 API
						
						
						
						
						
						
					 | 
					
						2015-11-28 22:00:24 +02:00 | 
					
					
						
						
							
							
							
						
					 |