Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e743af4d24
							
						
					 | 
					
						
						
							
							Merged #1062
						
						
						
						
						
						
					 | 
					
						2016-09-15 13:41:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f5065336a
							
						
					 | 
					
						
						
							
							Working on invoice fields
						
						
						
						
						
						
					 | 
					
						2016-09-05 17:44:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d14cf5f9ed
							
						
					 | 
					
						
						
							
							Working on invoice fields
						
						
						
						
						
						
					 | 
					
						2016-09-05 15:28:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cfbecb576
							
						
					 | 
					
						
						
							
							Fix for second custom line item field
						
						
						
						
						
						
					 | 
					
						2016-08-22 17:21:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							c01e42ac87
							
						
					 | 
					
						
						
							
							Added option to include line item taxes in line total
						
						
						
						
						
						
					 | 
					
						2016-08-15 18:08:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							63e725695a
							
						
					 | 
					
						
						
							
							Set up Elixir with built.js
						
						
						
						
						
						
					 | 
					
						2016-08-15 00:03:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							22c920701c
							
						
					 | 
					
						
						
							
							Implemented sweetalert
						
						
						
						
						
						
					 | 
					
						2016-07-28 19:55:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6c23ead60
							
						
					 | 
					
						
						
							
							Fix alignment of logo in footer
						
						
						
						
						
						
					 | 
					
						2016-07-26 09:55:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							74b552e132
							
						
					 | 
					
						
						
							
							Show 0% tax rates in line items
						
						
						
						
						
						
					 | 
					
						2016-07-21 20:21:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							8568f68ad2
							
						
					 | 
					
						
						
							
							Show 0% tax rates in line items
						
						
						
						
						
						
					 | 
					
						2016-07-21 20:18:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4795f33067
							
						
					 | 
					
						
						
							
							Adding back fixes
						
						
						
						
						
						
					 | 
					
						2016-07-21 16:04:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							498578cefc
							
						
					 | 
					
						
						
							
							Rollback to 2.6.5
						
						
						
						
						
						
					 | 
					
						2016-07-21 15:35:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							089ad1bd18
							
						
					 | 
					
						
						
							
							Making assets minified
						
						
						
						
						
						
					 | 
					
						2016-07-20 23:12:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							660ffab0c5
							
						
					 | 
					
						
						
							
							Checked in compiled files
						
						
						
						
						
						
					 | 
					
						2016-07-20 23:49:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5a5457d2b
							
						
					 | 
					
						
						
							
							JS problems after using elixir
						
						
						
						
						
						
						
						- Added missing JS files
- Added missing images
- Recreated merged files 
						
						
					 | 
					
						2016-07-20 19:38:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							d36675b15b
							
						
					 | 
					
						
						
							
							Use Elixir for asset management
						
						
						
						
						
						
						
						- Set up Elixir for asset management
- CSS + JS will be handled via Elixir/Gulp in gulpfile.js
- Removed outdates public/js files 
						
						
					 | 
					
						2016-07-20 08:29:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d534b5595b
							
						
					 | 
					
						
						
							
							Workaround for problem with images in PDF on MS Edge
						
						
						
						
						
						
					 | 
					
						2016-07-19 15:42:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							60982deb08
							
						
					 | 
					
						
						
							
							Don't show clients w/o names
						
						
						
						
						
						
					 | 
					
						2016-07-18 22:53:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2d70eb12a
							
						
					 | 
					
						
						
							
							Fix for branding logo with custom designs
						
						
						
						
						
						
					 | 
					
						2016-07-14 22:58:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf166a1a6f
							
						
					 | 
					
						
						
							
							Fix for [Object] problem with certain designs
						
						
						
						
						
						
					 | 
					
						2016-07-13 21:10:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							21a91ff0e1
							
						
					 | 
					
						
						
							
							Added expense category
						
						
						
						
						
						
					 | 
					
						2016-07-05 21:49:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							698ec1e9d4
							
						
					 | 
					
						
						
							
							Fix for markdown when text is a single line
						
						
						
						
						
						
					 | 
					
						2016-07-03 13:20:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dc0f93534
							
						
					 | 
					
						
						
							
							Fix for #922
						
						
						
						
						
						
					 | 
					
						2016-07-03 12:18:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							fec1161434
							
						
					 | 
					
						
						
							
							Fix for invoice footer
						
						
						
						
						
						
					 | 
					
						2016-06-30 20:53:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbe39f9aaf
							
						
					 | 
					
						
						
							
							Fix for elegant design
						
						
						
						
						
						
					 | 
					
						2016-06-29 22:59:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9603439a33
							
						
					 | 
					
						
						
							
							Added additional designs
						
						
						
						
						
						
					 | 
					
						2016-06-29 22:48:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Villeneuve
							
						 
					 | 
					
						
						
						
						
							
						
						
							eafdc12fa5
							
						
					 | 
					
						
						
							
							Add style to multiple subtotals labels
						
						
						
						
						
						
					 | 
					
						2016-06-08 14:00:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f3c309d41
							
						
					 | 
					
						
						
							
							Remove fallback support for dropzone
						
						
						
						
						
						
					 | 
					
						2016-05-30 11:51:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							947cb4a6f7
							
						
					 | 
					
						
						
							
							Better WePay configuration support
						
						
						
						
						
						
					 | 
					
						2016-05-14 17:23:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							41f4c98e08
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into payments-changes
						
						
						
						
						
						
					 | 
					
						2016-05-10 10:25:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							12c185ca49
							
						
					 | 
					
						
						
							
							Fix for regex issue with product autocomplete
						
						
						
						
						
						
					 | 
					
						2016-05-09 20:57:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							786b6567b6
							
						
					 | 
					
						
						
							
							Hide unit cost if the quantity column is hidden
						
						
						
						
						
						
					 | 
					
						2016-05-09 17:40:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Raymond
							
						 
					 | 
					
						
						
						
						
							
						
						
							986156117e
							
						
					 | 
					
						
						
							
							Copy custom values of invoice items
						
						
						
						
						
						
					 | 
					
						2016-05-07 15:29:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Raymond
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4ce4e0fc8
							
						
					 | 
					
						
						
							
							Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer.
						
						
						
						
						
						
					 | 
					
						2016-05-07 15:06:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							54be2f0b84
							
						
					 | 
					
						
						
							
							Improvements to the user table seeder
						
						
						
						
						
						
					 | 
					
						2016-05-05 20:18:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							861a47c3bb
							
						
					 | 
					
						
						
							
							Don't show due date in recurring invoice preview
						
						
						
						
						
						
					 | 
					
						2016-05-05 19:48:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe2a1fe66a
							
						
					 | 
					
						
						
							
							Add Braintree support
						
						
						
						
						
						
					 | 
					
						2016-04-26 19:59:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							07f50d188f
							
						
					 | 
					
						
						
							
							Fix for partial invoice label on PDF
						
						
						
						
						
						
					 | 
					
						2016-04-24 00:08:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b27505f63c
							
						
					 | 
					
						
						
							
							Fix for saving invoice client with id/public_id
						
						
						
						
						
						
					 | 
					
						2016-04-21 13:01:36 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd2c992158
							
						
					 | 
					
						
						
							
							Fix for bold design when product key is blank
						
						
						
						
						
						
					 | 
					
						2016-04-13 10:52:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8256127ec
							
						
					 | 
					
						
						
							
							Working on multiple tax rates
						
						
						
						
						
						
					 | 
					
						2016-03-31 13:28:22 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							db322d3fc7
							
						
					 | 
					
						
						
							
							Don't expect an invoice to have expenses
						
						
						
						
						
						
					 | 
					
						2016-03-24 19:08:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e62d7d296
							
						
					 | 
					
						
						
							
							Allow documents to be attached to expenses
						
						
						
						
						
						
					 | 
					
						2016-03-24 18:15:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c5c45a1e1
							
						
					 | 
					
						
						
							
							Improved handling of various document types; better documents zip
						
						
						
						
						
						
					 | 
					
						2016-03-24 11:33:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							942f543bbb
							
						
					 | 
					
						
						
							
							Display documents in invoice PDF
						
						
						
						
						
						
					 | 
					
						2016-03-23 18:40:42 -04:00 | 
					
					
						
						
							
							
							
						
					 |