| 
							
							
								 Dane Everitt | 800e2df6b2 | Merge branch 'develop' into feature/api-v1 # Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php | 2018-01-10 20:55:22 -06:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | d2afc29a80 | Refactor how repositories for the daemon work. | 2018-01-05 18:27:47 -06:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | d21f70c04b | Merge branch 'develop' into feature/api-v1 | 2018-01-01 13:33:06 -06:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | 0ec5a4e08c | Fix some file management bugs, closes #621 | 2018-01-01 13:21:10 -06:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | 8a38a8af4a | Update file manager to account for new API error responses | 2017-12-31 10:39:07 -06:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | e0d03513e4 | Cleanup frontend controllers and middleware | 2017-10-27 21:42:53 -05:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | e56f4cdd33 | Update license headers on files. | 2017-09-25 21:43:01 -05:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | 7222754580 | Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop | 2017-09-04 14:34:40 -05:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | b12f6f1156 | Tests for RemoteRequestController | 2017-09-04 14:34:38 -05:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | 8f14ee989d | Apply fixes from StyleCI | 2017-09-03 21:41:03 +00:00 |  | 
			
				
					| 
							
							
								 Dane Everitt | 54554465f2 | Add more front-end controllers, language file cleanup | 2017-09-03 16:32:52 -05:00 |  |