stanjg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60e1ffa564 
							
						 
					 
					
						
						
							
							Added a test for the controller and cleaned up the controller  
						
						
						
						
					 
					
						2018-05-27 00:16:13 +02:00 
						 
				 
			
				
					
						
							
							
								stanjg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a81c61ad8 
							
						 
					 
					
						
						
							
							Wording changes and fix of major fail last commit  
						
						
						
						
					 
					
						2018-05-26 21:02:47 +02:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							545e44df4e 
							
						 
					 
					
						
						
							
							Update file manager code  
						
						
						
						
					 
					
						2018-05-26 11:41:46 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							c6c37e1b88 
							
						 
					 
					
						
						
							
							occurred  
						
						
						
						
					 
					
						2018-05-13 11:12:25 -04:00 
						 
				 
			
				
					
						
							
							
								stanjg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							095d85bb60 
							
						 
					 
					
						
						
							
							Added the server as argument, and improved the bug fix  
						
						
						
						
					 
					
						2018-05-06 17:59:11 +02:00 
						 
				 
			
				
					
						
							
							
								stanjg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							28a97fea54 
							
						 
					 
					
						
						
							
							Polished it up  
						
						
						
						
					 
					
						2018-05-04 22:48:43 +02:00 
						 
				 
			
				
					
						
							
							
								stanjg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							93a7d11c28 
							
						 
					 
					
						
						
							
							Made a base  
						
						
						
						
					 
					
						2018-05-04 18:45:37 +02:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bac02f64e3 
							
						 
					 
					
						
						
							
							close   #1047  
						
						
						
						
					 
					
						2018-03-17 12:38:29 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3a5d21f455 
							
						 
					 
					
						
						
							
							Filemanager cleanup  
						
						
						
						
					 
					
						2018-03-08 21:30:07 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4964d294f6 
							
						 
					 
					
						
						
							
							Throw 504 where necessary  
						
						
						
						
					 
					
						2018-03-06 22:17:01 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bcb69603ad 
							
						 
					 
					
						
						
							
							Add support for user management of databases  
						
						
						
						
					 
					
						2018-03-02 19:03:55 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9b93629f45 
							
						 
					 
					
						
						
							
							Add UI for client API keys  
						
						
						
						
					 
					
						2018-02-28 23:30:39 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e7e50bc45d 
							
						 
					 
					
						
						
							
							Add a few new internal configs to the node config  
						
						
						
						
					 
					
						2018-02-18 20:39:43 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0341dbdfad 
							
						 
					 
					
						
						
							
							Add very basic cache busting  
						
						
						
						
					 
					
						2018-02-18 15:15:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8dcab927e5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/api-v1  
						
						
						
						
					 
					
						2018-01-21 14:31:32 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e7f8cedf0 
							
						 
					 
					
						
						
							
							Reorganize API files  
						
						
						
						
					 
					
						2018-01-19 19:58:57 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c3b9738364 
							
						 
					 
					
						
						
							
							Implement application API Keys  
						
						
						
						
					 
					
						2018-01-18 21:36:15 -06:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							f5fc27a19c 
							
						 
					 
					
						
						
							
							Fix   #872  ( #876 )  
						
						
						
						
					 
					
						2018-01-17 21:10:08 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f9fc3f4370 
							
						 
					 
					
						
						
							
							Update interface to begin change to seperate account API keys and application keys  
						
						... 
						
						
						
						Main difference is permissions, cleaner UI for normal users, and account keys use permissions assigned to servers and subusers while application keys use R/W ACLs stored in the key table. 
						
						
					 
					
						2018-01-14 13:30:55 -06:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							036bea2b94 
							
						 
					 
					
						
						
							
							Update schedule process to allow toggling/triggering via UI  
						
						
						
						
					 
					
						2018-01-08 21:43: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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b2d7b6488 
							
						 
					 
					
						
						
							
							If folder does not exist, reload the file manager index  
						
						
						
						
					 
					
						2017-12-31 10:30:19 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b9d67459b2 
							
						 
					 
					
						
						
							
							Update to Laravel 5.5 ( #814 )  
						
						
						
						
					 
					
						2017-12-17 13:07:38 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f9df463d32 
							
						 
					 
					
						
						
							
							Implement a better management interface for Settings ( #809 )  
						
						
						
						
					 
					
						2017-12-14 21:05:26 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3e8514b966 
							
						 
					 
					
						
						
							
							Merge pull request  #768  from Pterodactyl/feature/auth-controller-cleanup  
						
						... 
						
						
						
						Push updates to login page, mostly UI enhancements. 
						
						
					 
					
						2017-11-18 18:00:01 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							897338bfa7 
							
						 
					 
					
						
						
							
							Show socketio error messages  
						
						
						
						
					 
					
						2017-11-18 16:50:08 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6f52f4a614 
							
						 
					 
					
						
						
							
							Push updates to login page, mostly UI enhancements.  
						
						
						
						
					 
					
						2017-11-18 15:09:58 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c7c2c1a45e 
							
						 
					 
					
						
						
							
							Implement changes to 2FA system ( #761 )  
						
						
						
						
					 
					
						2017-11-18 13:35:33 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4dfc7a0053 
							
						 
					 
					
						
						
							
							Cleanup pagination CSS and UI  
						
						
						
						
					 
					
						2017-11-10 21:41:39 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ac2abd89e6 
							
						 
					 
					
						
						
							
							Fix bug listing allocations when making a new server.  
						
						... 
						
						
						
						closes  #730  
					
						2017-11-05 14:12:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ea71deb8a1 
							
						 
					 
					
						
						
							
							Merge pull request  #716  from Pterodactyl/feature/code-cleanup  
						
						... 
						
						
						
						Cleanup code, add more unit tests, prepare for beta 
						
						
					 
					
						2017-11-03 21:42:03 -04:00 
						 
				 
			
				
					
						
							
							
								Kağan Üstüngel 
							
						 
					 
					
						
						
						
						
							
						
						
							f5feb28ec1 
							
						 
					 
					
						
						
							
							Fix for js console causing browser to become unresponsive ( #715 )  
						
						
						
						
					 
					
						2017-11-02 18:57:54 -04:00 
						 
				 
			
				
					
						
							
							
								Adam Blunt 
							
						 
					 
					
						
						
						
						
							
						
						
							65a36d35b7 
							
						 
					 
					
						
						
							
							Fix console not loading sometimes ( #710 )  
						
						
						
						
					 
					
						2017-10-31 19:17:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jason aka Input 
							
						 
					 
					
						
						
						
						
							
						
						
							b5ff41e74c 
							
						 
					 
					
						
						
							
							Fix highlighting problem in the console. ( #709 )  
						
						
						
						
					 
					
						2017-10-31 19:16:12 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0d03513e4 
							
						 
					 
					
						
						
							
							Cleanup frontend controllers and middleware  
						
						
						
						
					 
					
						2017-10-27 21:42:53 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f98eb5904c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/add-frontend-server-configuration  
						
						
						
						
					 
					
						2017-10-18 22:37:23 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							97dc0519d6 
							
						 
					 
					
						
						
							
							Add database management back to front-end and begin some refactoring  
						
						... 
						
						
						
						Here we go again boys... 
						
						
					 
					
						2017-10-18 22:32:19 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							75c905a985 
							
						 
					 
					
						
						
							
							Feature/fix terminal notification ( #681 )  
						
						... 
						
						
						
						* show terminal notification on top
* show notification only when not scrolled down and new output available
* terminal: move scrolled down check outside of push loop 
						
						
					 
					
						2017-10-18 00:24:14 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2b80de03df 
							
						 
					 
					
						
						
							
							Fix sidebar dropdown not working  
						
						
						
						
					 
					
						2017-10-17 22:23:37 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17642bffe7 
							
						 
					 
					
						
						
							
							More code updates  
						
						
						
						
					 
					
						2017-10-07 17:21:41 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b1834307d5 
							
						 
					 
					
						
						
							
							Update demon routes to use /v1/  
						
						
						
						
					 
					
						2017-09-30 21:00:24 -05:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							09d958249d 
							
						 
					 
					
						
						
							
							Add togglable 2FA user requirements ( #635 )  
						
						
						
						
					 
					
						2017-09-25 15:58:16 -10:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c21d401e3 
							
						 
					 
					
						
						
							
							Combine Locations and Nodes on Create Server page ( #641 )  
						
						
						
						
					 
					
						2017-09-21 13:03:29 -10:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							763f7a996a 
							
						 
					 
					
						
						
							
							login page particles now repulse everywhere  
						
						
						
						
					 
					
						2017-09-17 21:20:33 +02:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e518be6ca 
							
						 
					 
					
						
						
							
							More color adjustments  
						
						
						
						
					 
					
						2017-09-13 22:38:28 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7f76684453 
							
						 
					 
					
						
						
							
							More schedule changes  
						
						
						
						
					 
					
						2017-09-13 21:46:43 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ac90b50f2 
							
						 
					 
					
						
						
							
							Begin refactoring Tasks to be apart of the Scheduler system  
						
						
						
						
					 
					
						2017-09-12 23:45:19 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							6c6a3c9458 
							
						 
					 
					
						
						
							
							Merge pull request  #615  from Pterodactyl/feature/customized-theme  
						
						... 
						
						
						
						Feature/customized theme 
						
						
					 
					
						2017-09-10 18:14:15 -10:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bab28dbc85 
							
						 
					 
					
						
						
							
							Initial implementation of new task mgmt system  👮  
						
						
						
						
					 
					
						2017-09-09 23:55:21 -05:00