Sergzy 
							
						 
					 
					
						
						
						
						
							
						
						
							bad9ae58e8 
							
						 
					 
					
						
						
							
							Fix environment_variables name ( #1212 )  
						
						
						
						
					 
					
						2018-06-30 13:25:40 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e2e5fd7c1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/upgrade-laravel-to-5.6  
						
						
						
						
					 
					
						2018-05-20 16:30:42 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							457e461f45 
							
						 
					 
					
						
						
							
							Merge pull request  #1144  from pterodactyl/feature/spelling  
						
						... 
						
						
						
						Spellchecked the whole application 
						
						
					 
					
						2018-05-20 16:24:09 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a4443b751 
							
						 
					 
					
						
						
							
							Fix the styling  
						
						
						
						
					 
					
						2018-05-13 17:41:01 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							02379b657d 
							
						 
					 
					
						
						
							
							Replace the log writer class with the new one  
						
						
						
						
					 
					
						2018-05-13 16:40:31 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							78b40a8055 
							
						 
					 
					
						
						
							
							Spelling mistakes for tests  
						
						
						
						
					 
					
						2018-05-13 11:12:54 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2dc0638d9 
							
						 
					 
					
						
						
							
							Fix app/ spelling errors  
						
						
						
						
					 
					
						2018-05-13 11:12:41 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba96829d13 
							
						 
					 
					
						
						
							
							Fix cron jobs by removing the extra unusable argument  
						
						
						
						
					 
					
						2018-05-13 00:42:25 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							88fd83d413 
							
						 
					 
					
						
						
							
							Remove unused imports ( #1102 )  
						
						
						
						
					 
					
						2018-04-08 15:37:27 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bde4d4187f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/api-integration-testing  
						
						
						
						
					 
					
						2018-03-21 22:25:16 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b96c2d16ee 
							
						 
					 
					
						
						
							
							Added validation to variable validation rules to validate that the validation rules are valid  
						
						... 
						
						
						
						closes  #988  
					
						2018-03-17 15:09:09 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							abd2a42471 
							
						 
					 
					
						
						
							
							Fix data integrity exception thrown when attempting to store updated server egg variables  
						
						
						
						
					 
					
						2018-03-10 13:55:24 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							40c74ae1e7 
							
						 
					 
					
						
						
							
							Add validation to prevent invalid ports,  closes   #1034  
						
						
						
						
					 
					
						2018-03-10 13:10:40 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ac9f83a8fe 
							
						 
					 
					
						
						
							
							Fix test to run with new bootstrapping  
						
						
						
						
					 
					
						2018-03-04 22:42:33 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							36837df0a6 
							
						 
					 
					
						
						
							
							Use beginning of UUID for server uuidShort  
						
						
						
						
					 
					
						2018-03-03 22:20:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a4f03f5d02 
							
						 
					 
					
						
						
							
							Handle missing daemon keys better and fix subuser missing key errors  
						
						
						
						
					 
					
						2018-03-03 21:31:44 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e39353a18d 
							
						 
					 
					
						
						
							
							Add tests for new service  
						
						
						
						
					 
					
						2018-03-02 19:37:21 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a765e0dbb6 
							
						 
					 
					
						
						
							
							closes   #991  
						
						
						
						
					 
					
						2018-02-27 19:43:47 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							633bba6d6e 
							
						 
					 
					
						
						
							
							Add support for external_id on servers,  closes   #975  
						
						
						
						
					 
					
						2018-02-24 11:57:12 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e9680fc29c 
							
						 
					 
					
						
						
							
							Fix for StyleCI  
						
						
						
						
					 
					
						2018-02-17 16:21:37 -06:00 
						 
				 
			
				
					
						
							
							
								ShadowKitten 
							
						 
					 
					
						
						
						
						
							
						
						
							d8be167a9c 
							
						 
					 
					
						
						
							
							Add support for allowing subusers to access SFTP. ( #918 )  
						
						
						
						
					 
					
						2018-02-17 16:10:44 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							241f7d0125 
							
						 
					 
					
						
						
							
							Fix some data integrity issues  
						
						
						
						
					 
					
						2018-02-17 13:37:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e1aa15dba 
							
						 
					 
					
						
						
							
							Fixes a bug that would cause non-editable variables on the front-end to throw a validation error  
						
						
						
						
					 
					
						2018-02-15 20:58:51 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e2cdb3b4b1 
							
						 
					 
					
						
						
							
							Add test cases for services  
						
						
						
						
					 
					
						2018-02-11 17:32:45 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3ecab82358 
							
						 
					 
					
						
						
							
							Fix exception when empty default value is passed for an egg variable,  closes   #934  
						
						
						
						
					 
					
						2018-02-11 16:47:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bf537922a3 
							
						 
					 
					
						
						
							
							Fix username validation and auto-generation,  closes   #927  
						
						
						
						
					 
					
						2018-02-11 16:39:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cfb7415e2a 
							
						 
					 
					
						
						
							
							Fix data integrity exception,  closes   #922  
						
						
						
						
					 
					
						2018-02-10 14:01:49 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd54c5abb1 
							
						 
					 
					
						
						
							
							Fix user password handling in Admin CP  
						
						
						
						
					 
					
						2018-02-07 21:13:40 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e49c739bde 
							
						 
					 
					
						
						
							
							Fix failing tests  
						
						
						
						
					 
					
						2018-02-04 15:43:09 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a19019980 
							
						 
					 
					
						
						
							
							Fix suspension/installed handling for servers  
						
						... 
						
						
						
						closes  Pterodactyl/Panel#891  
					
						2018-01-30 22:40:21 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c599112021 
							
						 
					 
					
						
						
							
							Finalize server management API  
						
						
						
						
					 
					
						2018-01-30 20:36:59 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5ed164e13e 
							
						 
					 
					
						
						
							
							Implement server creation though the API.  
						
						... 
						
						
						
						Also implements auto-deployment to specific locations and ports. 
						
						
					 
					
						2018-01-28 17:14:14 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17f6f3eeb6 
							
						 
					 
					
						
						
							
							Add server details modification endpoint to API.  
						
						
						
						
					 
					
						2018-01-20 16:03:23 -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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14f9e1ad43 
							
						 
					 
					
						
						
							
							More permission removal cleanup  
						
						
						
						
					 
					
						2018-01-14 12:11:04 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad3a954256 
							
						 
					 
					
						
						
							
							Rename APIKey to ApiKey  
						
						
						
						
					 
					
						2018-01-14 12:06:15 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0fb7fa30c 
							
						 
					 
					
						
						
							
							Fix failing ApiKeyCreationService test  
						
						
						
						
					 
					
						2018-01-13 16:23:43 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf21fd5a4b 
							
						 
					 
					
						
						
							
							More API updates, better support for node config edits  
						
						
						
						
					 
					
						2018-01-10 23:19:03 -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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d2afc29a80 
							
						 
					 
					
						
						
							
							Refactor how repositories for the daemon work.  
						
						
						
						
					 
					
						2018-01-05 18:27:47 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f9fe4a69b 
							
						 
					 
					
						
						
							
							Update calls to missing function  
						
						
						
						
					 
					
						2018-01-05 16:33:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60eb60013c 
							
						 
					 
					
						
						
							
							Update repository base code to be cleaner and make use of PHP 7 features  
						
						
						
						
					 
					
						2018-01-04 22:49:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							15289b76a7 
							
						 
					 
					
						
						
							
							Finish first round of User/Node API additions  
						
						... 
						
						
						
						Will still need some tweaking and improvements to allow everything to be used. 
						
						
					 
					
						2018-01-01 15:11:44 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4457634127 
							
						 
					 
					
						
						
							
							Fix user creation to use UUIDs correctly  
						
						... 
						
						
						
						Also updates the notification send method to be cleaner and more maintainable 
						
						
					 
					
						2018-01-01 12:13:08 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5efee34378 
							
						 
					 
					
						
						
							
							close   #840  
						
						
						
						
					 
					
						2017-12-30 20:25:04 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							10e2e6e379 
							
						 
					 
					
						
						
							
							close   #841  
						
						
						
						
					 
					
						2017-12-30 19:56:42 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b9d67459b2 
							
						 
					 
					
						
						
							
							Update to Laravel 5.5 ( #814 )  
						
						
						
						
					 
					
						2017-12-17 13:07:38 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							285485d7b0 
							
						 
					 
					
						
						
							
							Change how API keys are validated ( #771 )  
						
						
						
						
					 
					
						2017-12-03 14:29:14 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							975597b4d0 
							
						 
					 
					
						
						
							
							Implement changes to administrative user revocation,  closes   #733  
						
						
						
						
					 
					
						2017-12-03 14:00:47 -06:00