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 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							d0bfe82512 
							
						 
					 
					
						
						
							
							Expense module  
						
						
						
						
					 
					
						2016-01-09 06:24:43 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							d89dc2e827 
							
						 
					 
					
						
						
							
							Expenses  
						
						
						
						
					 
					
						2016-01-08 19:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							d8a501ed95 
							
						 
					 
					
						
						
							
							Posibility to modify payment terms  
						
						
						
						
					 
					
						2016-01-07 20:39:51 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							eed8ee55a1 
							
						 
					 
					
						
						
							
							Vendor  
						
						
						
						
					 
					
						2016-01-07 16:21:13 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							17af1e2b9c 
							
						 
					 
					
						
						
							
							Expenses  
						
						
						
						
					 
					
						2016-01-07 16:14:11 +01:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							acbfa46062 
							
						 
					 
					
						
						
							
							Bug fix  
						
						
						
						
					 
					
						2016-01-07 13:16:12 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc3ce9128 
							
						 
					 
					
						
						
							
							Added early_access field  
						
						
						
						
					 
					
						2016-01-07 13:11:09 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							ecaf31ec95 
							
						 
					 
					
						
						
							
							Added early_access field  
						
						
						
						
					 
					
						2016-01-07 13:09:21 +02:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							a52364a039 
							
						 
					 
					
						
						
							
							expense  
						
						
						
						
					 
					
						2016-01-07 12:04:01 +01:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							77f9e89b40 
							
						 
					 
					
						
						
							
							Added _id to header/body font properties  
						
						
						
						
					 
					
						2016-01-07 09:19:57 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							14192846e8 
							
						 
					 
					
						
						
							
							Merging: custom font support  
						
						
						
						
					 
					
						2016-01-07 09:08:30 +02:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							48ce3f64e6 
							
						 
					 
					
						
						
							
							expenses  
						
						
						
						
					 
					
						2016-01-06 20:52:09 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							dba3a39559 
							
						 
					 
					
						
						
							
							Vendor management  
						
						
						
						
					 
					
						2016-01-06 15:23:58 +01:00 
						 
				 
			
				
					
						
							
							
								steenrabol 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ee8ed813 
							
						 
					 
					
						
						
							
							Expense module  
						
						
						
						
					 
					
						2016-01-05 12:47:03 +01:00 
						 
				 
			
				
					
						
							
							
								Joshua Dwire 
							
						 
					 
					
						
						
						
						
							
						
						
							b7687967a6 
							
						 
					 
					
						
						
							
							Add custom CSS support  
						
						... 
						
						
						
						* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text 
						
						
					 
					
						2015-12-30 13:11:51 -05:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							6d6f8f5cab 
							
						 
					 
					
						
						
							
							Fix for dev channel Chrome crash  
						
						
						
						
					 
					
						2015-12-29 12:23: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 
							
						 
					 
					
						
						
						
						
							
						
						
							3f1891fa3b 
							
						 
					 
					
						
						
							
							Bug fixes  
						
						
						
						
					 
					
						2015-12-23 13:49:49 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							c5a1abf66f 
							
						 
					 
					
						
						
							
							Added HTML email designs  
						
						
						
						
					 
					
						2015-12-02 15:26:06 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							5c6b2fe906 
							
						 
					 
					
						
						
							
							Working on import  
						
						
						
						
					 
					
						2015-11-18 16:40:50 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							029e740a6c 
							
						 
					 
					
						
						
							
							Working on the API  
						
						
						
						
					 
					
						2015-11-03 21:03:24 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							9b840a24dd 
							
						 
					 
					
						
						
							
							Enabled social login  
						
						
						
						
					 
					
						2015-11-01 20:21:11 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							aa0a35f9d8 
							
						 
					 
					
						
						
							
							Added default quote terms  
						
						
						
						
					 
					
						2015-10-29 16:42:05 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							404435a145 
							
						 
					 
					
						
						
							
							Refactored to events  
						
						
						
						
					 
					
						2015-10-28 21:22:07 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							eca14583fd 
							
						 
					 
					
						
						
							
							Custom invoice/quote numbers  
						
						
						
						
					 
					
						2015-10-22 21:57:47 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca98c9080 
							
						 
					 
					
						
						
							
							Custom invoice/quote numbers  
						
						
						
						
					 
					
						2015-10-22 21:48:12 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							47f38ad54e 
							
						 
					 
					
						
						
							
							Added support for default taxes  
						
						
						
						
					 
					
						2015-10-21 14:11:08 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							9283362d28 
							
						 
					 
					
						
						
							
							Bug fixes  
						
						
						
						
					 
					
						2015-10-18 10:30:28 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							1d04bc2a05 
							
						 
					 
					
						
						
							
							Added custom invoice text fields  
						
						
						
						
					 
					
						2015-10-11 17:41:09 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							6d7f0d6611 
							
						 
					 
					
						
						
							
							Zapier fixes  
						
						
						
						
					 
					
						2015-10-02 11:32:13 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							4268c18f8a 
							
						 
					 
					
						
						
							
							Fixed money format in PDF for EU  
						
						
						
						
					 
					
						2015-09-25 12:57:40 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							98cabd4138 
							
						 
					 
					
						
						
							
							Added auto-reminder emails  
						
						
						
						
					 
					
						2015-09-17 22:01:06 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							4741fad4be 
							
						 
					 
					
						
						
							
							Added auto-billing and per-client language support  
						
						
						
						
					 
					
						2015-09-10 20:50:09 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							3fdad48179 
							
						 
					 
					
						
						
							
							API improvements  
						
						
						
						
					 
					
						2015-09-07 12:07:55 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							4d71b193d6 
							
						 
					 
					
						
						
							
							Bug fixes  
						
						
						
						
					 
					
						2015-09-02 13:59:03 +03:00 
						 
				 
			
				
					
						
							
							
								Tobias Rendler 
							
						 
					 
					
						
						
						
						
							
						
						
							663070e36b 
							
						 
					 
					
						
						
							
							Fixed timezone DST issues in timelog  
						
						... 
						
						
						
						- Added moment-timezone-with-data.js
- Added new datetime format and variants 
						
						
					 
					
						2015-08-13 12:54:03 +02:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							78bf49cd19 
							
						 
					 
					
						
						
							
							Recurring invoices no longer prevent invoice numbers from being sequential  
						
						
						
						
					 
					
						2015-08-10 18:48:41 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							ba8419356d 
							
						 
					 
					
						
						
							
							Moved invoice design files  
						
						
						
						
					 
					
						2015-07-28 10:00:00 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							35d794b36f 
							
						 
					 
					
						
						
							
							Enabled customizing invoice designs  
						
						
						
						
					 
					
						2015-07-21 21:51:56 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c00a0531 
							
						 
					 
					
						
						
							
							Re-worked editing task details  
						
						
						
						
					 
					
						2015-07-12 22:43:45 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							c42dfb8b96 
							
						 
					 
					
						
						
							
							Improvments to multi-account switching  
						
						
						
						
					 
					
						2015-07-07 23:08:16 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							67dff394b4 
							
						 
					 
					
						
						
							
							Added multi-company support  
						
						
						
						
					 
					
						2015-06-16 22:35:35 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							fa27ed9657 
							
						 
					 
					
						
						
							
							Added resume option to tasks  
						
						
						
						
					 
					
						2015-06-14 17:52:35 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							97adc27ba1 
							
						 
					 
					
						
						
							
							Added resume option to tasks  
						
						
						
						
					 
					
						2015-06-14 17:03:37 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							88865d44fc 
							
						 
					 
					
						
						
							
							Added resume option to tasks  
						
						
						
						
					 
					
						2015-06-14 15:29:37 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							84a117c84b 
							
						 
					 
					
						
						
							
							Added resume option to tasks  
						
						
						
						
					 
					
						2015-06-14 15:21:29 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							1c1bef3abb 
							
						 
					 
					
						
						
							
							Bug fixes  
						
						
						
						
					 
					
						2015-06-10 11:34:20 +03:00 
						 
				 
			
				
					
						
							
							
								Hillel Coren 
							
						 
					 
					
						
						
						
						
							
						
						
							976773ce7b 
							
						 
					 
					
						
						
							
							Enabled setting custom invoice item labels  
						
						
						
						
					 
					
						2015-05-27 23:20:35 +03:00