Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a7381294e
							
						
					 | 
					
						
						
							
							Working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-10 17:04:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							815c3991a6
							
						
					 | 
					
						
						
							
							Working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-10 15:57:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							d374843e50
							
						
					 | 
					
						
						
							
							Working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-09 23:06:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a4f705c8b
							
						
					 | 
					
						
						
							
							working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-09 17:14:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e65fdd54b0
							
						
					 | 
					
						
						
							
							Fix for online payments page
						
						
						
						
						
						
					 | 
					
						2016-08-08 21:21:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							472ba842eb
							
						
					 | 
					
						
						
							
							Working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-08 17:45:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8fda5f241
							
						
					 | 
					
						
						
							
							Working on the bot
						
						
						
						
						
						
					 | 
					
						2016-08-07 22:42:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							325aaa3272
							
						
					 | 
					
						
						
							
							Added back error method
						
						
						
						
						
						
					 | 
					
						2016-08-07 22:42:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8a124dc0f
							
						
					 | 
					
						
						
							
							Working on our bot
						
						
						
						
						
						
					 | 
					
						2016-08-07 09:10:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1a278e4ff
							
						
					 | 
					
						
						
							
							Working on our bot
						
						
						
						
						
						
					 | 
					
						2016-08-06 20:54:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							0746500c1a
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
						
						
						
						
						
						
					 | 
					
						2016-08-04 20:02:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f3bd44d9a
							
						
					 | 
					
						
						
							
							Working on bots
						
						
						
						
						
						
					 | 
					
						2016-08-04 20:01:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef8d2615f4
							
						
					 | 
					
						
						
							
							improve error handling for document downloads
						
						
						
						
						
						
					 | 
					
						2016-08-03 23:03:14 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Bomba
							
						 
					 | 
					
						
						
						
						
							
						
						
							e393b891bd
							
						
					 | 
					
						
						
							
							improve error handling for document downloads
						
						
						
						
						
						
					 | 
					
						2016-08-03 23:02:42 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							af78a3dd2d
							
						
					 | 
					
						
						
							
							Test Stripe credentials when adding gateway
						
						
						
						
						
						
					 | 
					
						2016-07-29 14:58:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa53a96b5d
							
						
					 | 
					
						
						
							
							Verify that invoice number is unique using JS
						
						
						
						
						
						
					 | 
					
						2016-07-27 15:46:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							05a92fea8d
							
						
					 | 
					
						
						
							
							Fix for report checkboxes
						
						
						
						
						
						
					 | 
					
						2016-07-27 13:40:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c314347db
							
						
					 | 
					
						
						
							
							Fix for upgrading Stripe accounts
						
						
						
						
						
						
					 | 
					
						2016-07-27 12:53:11 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c15e2a735
							
						
					 | 
					
						
						
							
							Fix for payment gateway failing validation
						
						
						
						
						
						
					 | 
					
						2016-07-21 20:09:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							498578cefc
							
						
					 | 
					
						
						
							
							Rollback to 2.6.5
						
						
						
						
						
						
					 | 
					
						2016-07-21 15:35:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4f13d3119
							
						
					 | 
					
						
						
							
							Fix for attaching files
						
						
						
						
						
						
					 | 
					
						2016-07-20 20:09:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bb8f0ca4a
							
						
					 | 
					
						
						
							
							Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js
						
						
						
						
						
						
						
						Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php 
						
						
					 | 
					
						2016-07-20 10:49:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e0129b279
							
						
					 | 
					
						
						
							
							Fix when adding a new user who is already logged in
						
						
						
						
						
						
					 | 
					
						2016-07-19 10:59:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb4a2b6a49
							
						
					 | 
					
						
						
							
							Fix for app cipher setting
						
						
						
						
						
						
					 | 
					
						2016-07-19 10:38:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcfea90781
							
						
					 | 
					
						
						
							
							Merge pull request #989 from codedge/Put-cipher-back-to-env
						
						
						
						
						
						
						
						Put APP_CIPHER back to .env 
						
						
					 | 
					
						2016-07-19 10:28:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cb797fcc2
							
						
					 | 
					
						
						
							
							Fix for cancel account
						
						
						
						
						
						
					 | 
					
						2016-07-18 22:07:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce6068f924
							
						
					 | 
					
						
						
							
							Additional online payment checks
						
						
						
						
						
						
					 | 
					
						2016-07-18 22:03:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e5207973f
							
						
					 | 
					
						
						
							
							Prevent entering online payment for deleted invoice
						
						
						
						
						
						
					 | 
					
						2016-07-18 21:05:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d7e412d24
							
						
					 | 
					
						
						
							
							Put APP_CIPHER back to .env
						
						
						
						
						
						
						
						- APP_CIPHER included in .env.example
- APP_CIPHER being included into .env when doing a fresh install 
						
						
					 | 
					
						2016-07-18 11:13:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							59969a4677
							
						
					 | 
					
						
						
							
							Fix for API pagination
						
						
						
						
						
						
					 | 
					
						2016-07-17 13:31:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e568dc408
							
						
					 | 
					
						
						
							
							Fixes for WePay
						
						
						
						
						
						
					 | 
					
						2016-07-16 23:51:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8672e3feb
							
						
					 | 
					
						
						
							
							Fix for buy now buttons
						
						
						
						
						
						
					 | 
					
						2016-07-16 23:51:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							36e50e7bcb
							
						
					 | 
					
						
						
							
							Fixes for the API
						
						
						
						
						
						
					 | 
					
						2016-07-15 16:47:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							86c08f3af5
							
						
					 | 
					
						
						
							
							Working on new pricing
						
						
						
						
						
						
					 | 
					
						2016-07-15 11:24:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							431f596d1d
							
						
					 | 
					
						
						
							
							Working on new pricing
						
						
						
						
						
						
					 | 
					
						2016-07-14 22:58:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							8590f9ad17
							
						
					 | 
					
						
						
							
							Working on new pricing
						
						
						
						
						
						
					 | 
					
						2016-07-14 12:46:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa9b0bf78b
							
						
					 | 
					
						
						
							
							Working on buy now buttons
						
						
						
						
						
						
					 | 
					
						2016-07-13 12:03:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							401851e212
							
						
					 | 
					
						
						
							
							Working on buy now buttons
						
						
						
						
						
						
					 | 
					
						2016-07-12 23:46:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							a32e372d40
							
						
					 | 
					
						
						
							
							Bug fix
						
						
						
						
						
						
					 | 
					
						2016-07-12 08:05:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e68e213237
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-07-11 23:38:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							316284b7e2
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-07-11 23:36:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b233aa0744
							
						
					 | 
					
						
						
							
							Merge branch 'release-2.6'
						
						
						
						
						
						
						
						Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php 
						
						
					 | 
					
						2016-07-11 23:33:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							986487b4c9
							
						
					 | 
					
						
						
							
							Working on new hosted pricing
						
						
						
						
						
						
					 | 
					
						2016-07-11 20:08:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							afb34d1de6
							
						
					 | 
					
						
						
							
							Fix saving task without a client
						
						
						
						
						
						
					 | 
					
						2016-07-10 13:20:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							6756fde908
							
						
					 | 
					
						
						
							
							Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream
						
						
						
						
						
						
						
						#583 add task creating editing to activity stream 
						
						
					 | 
					
						2016-07-10 12:42:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd2155d10a
							
						
					 | 
					
						
						
							
							Merge pull request #950 from codedge/#868-Configurable-start-of-week
						
						
						
						
						
						
						
						Adding configuration for first day of the week 
						
						
					 | 
					
						2016-07-10 12:42:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							386c606558
							
						
					 | 
					
						
						
							
							Added support for taxes to expenses
						
						
						
						
						
						
					 | 
					
						2016-07-07 19:54:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f8ae65310
							
						
					 | 
					
						
						
							
							Working on expense category permissions
						
						
						
						
						
						
					 | 
					
						2016-07-07 11:44:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6b60c6f1a
							
						
					 | 
					
						
						
							
							Working on expense categories
						
						
						
						
						
						
					 | 
					
						2016-07-07 11:03:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd9aae1e22
							
						
					 | 
					
						
						
							
							Working on expense categories
						
						
						
						
						
						
					 | 
					
						2016-07-06 21:35:16 +03:00 | 
					
					
						
						
							
							
							
						
					 |