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
							
						 
					 | 
					
						
						
						
						
							
						
						
							afb34d1de6
							
						
					 | 
					
						
						
							
							Fix saving task without a client
						
						
						
						
						
						
					 | 
					
						2016-07-10 13:20:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1dc1a7e5b
							
						
					 | 
					
						
						
							
							Added tasks to activity on dashboard
						
						
						
						
						
						
						
						- Fixes #583 and resolves #583
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard 
						
						
					 | 
					
						2016-07-05 16:31:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dc9b3fceb
							
						
					 | 
					
						
						
							
							Made 'viewable' scope default behavior
						
						
						
						
						
						
					 | 
					
						2016-07-04 19:49:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Lösken
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fbda85a59
							
						
					 | 
					
						
						
							
							Code Refactoring
						
						
						
						
						
						
						
						- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax 
						
						
					 | 
					
						2016-07-03 16:19:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							40241cbf38
							
						
					 | 
					
						
						
							
							Restrict client list
						
						
						
						
						
						
					 | 
					
						2016-06-08 17:56:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							f67990d636
							
						
					 | 
					
						
						
							
							Restrict client list
						
						
						
						
						
						
					 | 
					
						2016-06-08 17:56:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							933f2968d6
							
						
					 | 
					
						
						
							
							Working on form requests
						
						
						
						
						
						
					 | 
					
						2016-05-01 22:30:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							2efd419791
							
						
					 | 
					
						
						
							
							Moving permissions to form requests
						
						
						
						
						
						
					 | 
					
						2016-05-01 15:04:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							05bd8d9318
							
						
					 | 
					
						
						
							
							Moving permissions to form requests
						
						
						
						
						
						
					 | 
					
						2016-05-01 14:31:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9979eba5d9
							
						
					 | 
					
						
						
							
							Working on custom route model binding
						
						
						
						
						
						
					 | 
					
						2016-04-28 15:16:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc0d4d3edd
							
						
					 | 
					
						
						
							
							Finish migrating to Laravel ACL
						
						
						
						
						
						
					 | 
					
						2016-04-25 21:53:39 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec1bc6f2cf
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2016-03-17 10:11:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							90e1f6695c
							
						
					 | 
					
						
						
							
							Improve user permission support
						
						
						
						
						
						
						
						* Hide links based on permissions
* Restrict editing/creating within other UI 
						
						
					 | 
					
						2016-03-15 22:07:11 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joshua Dwire
							
						 
					 | 
					
						
						
						
						
							
						
						
							0148d06205
							
						
					 | 
					
						
						
							
							Add user permission support
						
						
						
						
						
						
					 | 
					
						2016-03-15 19:08:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							aef4c6be98
							
						
					 | 
					
						
						
							
							Upgrade to Laravel 5.2
						
						
						
						
						
						
					 | 
					
						2016-03-02 15:36:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							db4ec4fb62
							
						
					 | 
					
						
						
							
							Added statust to client view page
						
						
						
						
						
						
					 | 
					
						2016-02-04 20:36:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hanne@hannenijhuis.nl
							
						 
					 | 
					
						
						
						
						
							
						
						
							e460f154a5
							
						
					 | 
					
						
						
							
							Bug fix typo in TaskController
						
						
						
						
						
						
					 | 
					
						2016-01-01 15:32:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							60daef8d58
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-12-29 19:49:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							19d5d49e63
							
						
					 | 
					
						
						
							
							Working on #427
						
						
						
						
						
						
					 | 
					
						2015-12-13 22:12:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rafael.sisweb
							
						 
					 | 
					
						
						
						
						
							
						
						
							c182b67408
							
						
					 | 
					
						
						
							
							Remove action header again
						
						
						
						
						
						
					 | 
					
						2015-11-30 06:29:43 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rafael.sisweb
							
						 
					 | 
					
						
						
						
						
							
						
						
							5888fdf12a
							
						
					 | 
					
						
						
							
							Missing action header on datatables
						
						
						
						
						
						
					 | 
					
						2015-11-24 06:59:30 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							002c994c0b
							
						
					 | 
					
						
						
							
							Refactoring datatable code
						
						
						
						
						
						
					 | 
					
						2015-11-06 01:14:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							436b8be8d9
							
						
					 | 
					
						
						
							
							Refactoring datatable code
						
						
						
						
						
						
					 | 
					
						2015-11-06 00:37:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							404435a145
							
						
					 | 
					
						
						
							
							Refactored to events
						
						
						
						
						
						
					 | 
					
						2015-10-28 21:22:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							254a819e92
							
						
					 | 
					
						
						
							
							Fix for #445
						
						
						
						
						
						
					 | 
					
						2015-10-05 20:48:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							06be7afedf
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-09-29 21:19:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4268c18f8a
							
						
					 | 
					
						
						
							
							Fixed money format in PDF for EU
						
						
						
						
						
						
					 | 
					
						2015-09-25 12:57:40 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							79aa5bad92
							
						
					 | 
					
						
						
							
							Minor fixes
						
						
						
						
						
						
					 | 
					
						2015-09-04 10:20:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d96a9daed
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-09-03 10:32:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bf287f51a
							
						
					 | 
					
						
						
							
							Fixed task bug
						
						
						
						
						
						
					 | 
					
						2015-09-02 23:33:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d71b193d6
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-09-02 13:59:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4672b1213
							
						
					 | 
					
						
						
							
							Merge pull request #405 from trendler/master
						
						
						
						
						
						
						
						Fixed timezone DST issues in timelog 
						
						
					 | 
					
						2015-09-01 23:29:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e6b25bcc4
							
						
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2015-08-14 15:04:33 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							25496061ee
							
						
					 | 
					
						
						
							
							Ensured JS client dates use timezone setting
						
						
						
						
						
						
					 | 
					
						2015-07-15 17:45:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9c00a0531
							
						
					 | 
					
						
						
							
							Re-worked editing task details
						
						
						
						
						
						
					 | 
					
						2015-07-12 22:43:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c577371bb
							
						
					 | 
					
						
						
							
							Added resume option to tasks
						
						
						
						
						
						
					 | 
					
						2015-06-14 17:49:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hillel Coren
							
						 
					 | 
					
						
						
						
						
							
						
						
							97adc27ba1
							
						
					 | 
					
						
						
							
							Added resume option to tasks
						
						
						
						
						
						
					 | 
					
						2015-06-14 17:03: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							3da1e738d8
							
						
					 | 
					
						
						
							
							Working on tasks
						
						
						
						
						
						
					 | 
					
						2015-05-27 19:52:10 +03:00 | 
					
					
						
						
							
							
							
						
					 |