Bartlomiej Szala
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d67e54fbb
							
						
					 | 
					
						
						
							
							Add swap currency symbol to currency
						
						
						
						
						
						
					 | 
					
						2016-05-16 22:33:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6942a199f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into wepay-integration
						
						
						
						
						
						
					 | 
					
						2016-05-15 21:21:59 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							d99d81d655
							
						
					 | 
					
						
						
							
							Make autobill setting numbers match token settings
						
						
						
						
						
						
					 | 
					
						2016-05-14 23:15:22 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c4009d1ef
							
						
					 | 
					
						
						
							
							Fixes for initial setup
						
						
						
						
						
						
					 | 
					
						2016-05-12 20:27:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							cca4e40ef5
							
						
					 | 
					
						
						
							
							Fix problem with migration
						
						
						
						
						
						
					 | 
					
						2016-05-12 12:44:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d41d8aeb6
							
						
					 | 
					
						
						
							
							Payments bug fixes - Part 2
						
						
						
						
						
						
					 | 
					
						2016-05-11 12:53:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ca073291e
							
						
					 | 
					
						
						
							
							Make storing card summary locally part of payments changes
						
						
						
						
						
						
					 | 
					
						2016-05-10 19:17:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							88ec714cd5
							
						
					 | 
					
						
						
							
							Store Stripe card summary locally
						
						
						
						
						
						
					 | 
					
						2016-05-10 18:46:32 -04: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fc44962d4
							
						
					 | 
					
						
						
							
							Add Braintree/PayPal support
						
						
						
						
						
						
					 | 
					
						2016-05-06 22:33:03 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf98c37f40
							
						
					 | 
					
						
						
							
							Better Braintree support
						
						
						
						
						
						
					 | 
					
						2016-05-06 17:05:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a64db3234
							
						
					 | 
					
						
						
							
							Allow client to choose auto bill settings
						
						
						
						
						
						
					 | 
					
						2016-05-06 13:26:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed1f2b6044
							
						
					 | 
					
						
						
							
							Handle failed payments
						
						
						
						
						
						
					 | 
					
						2016-04-30 17:54:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cb2b9dc25
							
						
					 | 
					
						
						
							
							Use existing PaymentType instead of CardType
						
						
						
						
						
						
					 | 
					
						2016-04-27 22:13:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							42c1f537bc
							
						
					 | 
					
						
						
							
							Store/display credit card type, expiration and last 4 digits
						
						
						
						
						
						
					 | 
					
						2016-04-23 22:10:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8170f0324
							
						
					 | 
					
						
						
							
							Support refunds from the admin UI
						
						
						
						
						
						
					 | 
					
						2016-04-23 16:40:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad68d64dca
							
						
					 | 
					
						
						
							
							Changes for white label license
						
						
						
						
						
						
					 | 
					
						2016-04-21 22:01:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b27505f63c
							
						
					 | 
					
						
						
							
							Fix for saving invoice client with id/public_id
						
						
						
						
						
						
					 | 
					
						2016-04-21 13:01:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6711678fbe
							
						
					 | 
					
						
						
							
							Merge pull request #822 from joshuadwire/enterprise-plan
						
						
						
						
						
						
						
						Improve enterprise plan migration 
						
						
					 | 
					
						2016-04-20 19:42:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							71b6b6eb87
							
						
					 | 
					
						
						
							
							More robust migration; avoids timeout failures
						
						
						
						
						
						
					 | 
					
						2016-04-20 11:47:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5b3fa56ac
							
						
					 | 
					
						
						
							
							Don't try to migrate nonexistent accounts
						
						
						
						
						
						
					 | 
					
						2016-04-20 09:50:13 -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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8ad27963e
							
						
					 | 
					
						
						
							
							Fix table name in migration
						
						
						
						
						
						
					 | 
					
						2016-04-19 10:30:25 -04: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							089349b591
							
						
					 | 
					
						
						
							
							Complete companies migration
						
						
						
						
						
						
					 | 
					
						2016-04-16 20:15:17 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4b8396c0f
							
						
					 | 
					
						
						
							
							Fix documents migration
						
						
						
						
						
						
					 | 
					
						2016-04-16 20:15:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b1bfef698
							
						
					 | 
					
						
						
							
							Add support for multiple plans/terms
						
						
						
						
						
						
					 | 
					
						2016-04-16 18:34:39 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba3aaf47fd
							
						
					 | 
					
						
						
							
							Added flag to disable client portal dashboard
						
						
						
						
						
						
					 | 
					
						2016-03-31 12:32:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							be9e7beaed
							
						
					 | 
					
						
						
							
							Support for multiple tax rates
						
						
						
						
						
						
					 | 
					
						2016-03-31 12:29:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2d22fbb50
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
						
						
						
						
						
						
						
						Conflicts:
	resources/views/invoices/knockout.blade.php 
						
						
					 | 
					
						2016-03-27 18:20:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d70bc4e922
							
						
					 | 
					
						
						
							
							Support multiple tax rates
						
						
						
						
						
						
					 | 
					
						2016-03-27 18:06:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6056104bd
							
						
					 | 
					
						
						
							
							Display documents and zip download on client invoice page
						
						
						
						
						
						
					 | 
					
						2016-03-23 22:41:19 -04: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							d810ba7f6b
							
						
					 | 
					
						
						
							
							Improved document support
						
						
						
						
						
						
					 | 
					
						2016-03-23 15:41:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							88808d44bf
							
						
					 | 
					
						
						
							
							Add support for invoice attachments
						
						
						
						
						
						
					 | 
					
						2016-03-22 22:23:45 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							5640c74f35
							
						
					 | 
					
						
						
							
							Migrate logos to use Laravel Filesystem
						
						
						
						
						
						
					 | 
					
						2016-03-22 16:19:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a29efbc6f
							
						
					 | 
					
						
						
							
							Merge pull request #771 from joshuadwire/user-permissions
						
						
						
						
						
						
						
						User permissions 
						
						
					 | 
					
						2016-03-17 09:54:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0148d06205
							
						
					 | 
					
						
						
							
							Add user permission support
						
						
						
						
						
						
					 | 
					
						2016-03-15 19:08:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vincentdh
							
						 
					 | 
					
						
						
						
						
							
						
						
							a74ede6cf7
							
						
					 | 
					
						
						
							
							Create 2016_03_14_214710_add_support_three_decimal_taxes.php
						
						
						
						
						
						
						
						Changes made to the DB to support 3 decimals tax rates. 
						
						
					 | 
					
						2016-03-14 21:49:52 -04: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5fac72e01
							
						
					 | 
					
						
						
							
							Bug fix for migration down
						
						
						
						
						
						
					 | 
					
						2016-03-01 11:27:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							6376302ed9
							
						
					 | 
					
						
						
							
							Add option for client portal password
						
						
						
						
						
						
					 | 
					
						2016-02-29 16:46:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2153a8e227
							
						
					 | 
					
						
						
							
							Added custom invoice item fields
						
						
						
						
						
						
					 | 
					
						2016-02-28 13:59:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce1717cf53
							
						
					 | 
					
						
						
							
							Fix for issue updating
						
						
						
						
						
						
					 | 
					
						2016-02-05 10:48:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							024e1eb046
							
						
					 | 
					
						
						
							
							Fix for issues when updating
						
						
						
						
						
						
					 | 
					
						2016-02-04 22:58:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b33c896beb
							
						
					 | 
					
						
						
							
							Fix migration down
						
						
						
						
						
						
					 | 
					
						2016-02-03 14:12:55 +02:00 | 
					
					
						
						
							
							
							
						
					 |