Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b3fb658511 
							
						 
					 
					
						
						
							
							Merge branch '0.7-develop' into develop  
						
						
						
						
					 
					
						2020-03-15 17:30:28 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05d859c985 
							
						 
					 
					
						
						
							
							Ensure password used when creating a database is valid;  closes   #1852  
						
						
						
						
					 
					
						2020-03-15 16:25:29 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							51defae917 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2019-12-28 11:49:08 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb39826f46 
							
						 
					 
					
						
						
							
							Add base logic to configure two factor on account  
						
						
						
						
					 
					
						2019-12-22 17:03:44 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							edf27a5542 
							
						 
					 
					
						
						
							
							Don't cache the manifest like this, pointless  
						
						
						
						
					 
					
						2019-12-22 15:41:38 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c96bad4080 
							
						 
					 
					
						
						
							
							FIx force deletion  
						
						
						
						
					 
					
						2019-12-22 15:08:11 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6276a03a4e 
							
						 
					 
					
						
						
							
							Fix links in admin area  
						
						
						
						
					 
					
						2019-12-22 14:03:49 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							34ffcdae7a 
							
						 
					 
					
						
						
							
							Remove unnecessary API calls to daemon  
						
						
						
						
					 
					
						2019-12-22 13:45:40 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e87db889e9 
							
						 
					 
					
						
						
							
							Fix server data not updating correctly on daemon  
						
						
						
						
					 
					
						2019-12-21 21:01:38 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2a92304023 
							
						 
					 
					
						
						
							
							Fix server creation logic  
						
						
						
						
					 
					
						2019-12-16 21:02:30 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2cabfeec15 
							
						 
					 
					
						
						
							
							Daemon secret is not a thing anymore  
						
						
						
						
					 
					
						2019-12-15 18:31:15 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c087f6429f 
							
						 
					 
					
						
						
							
							Temporary patch to get user management pages displaying correctly  
						
						
						
						
					 
					
						2019-12-08 11:02:59 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ed50259484 
							
						 
					 
					
						
						
							
							[#3896cn] Clean up code handling server suspension  
						
						
						
						
					 
					
						2019-11-30 15:37:13 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2eee6f35d4 
							
						 
					 
					
						
						
							
							Pass along the data in a more logical format  
						
						
						
						
					 
					
						2019-11-24 20:40:29 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2af653733c 
							
						 
					 
					
						
						
							
							Insane number of changes required to get the build to post  
						
						
						
						
					 
					
						2019-11-24 20:19:31 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							547e8840e2 
							
						 
					 
					
						
						
							
							Untested code to perform an update of server build settings  
						
						
						
						
					 
					
						2019-11-24 15:08:54 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c17f9ba8a9 
							
						 
					 
					
						
						
							
							Move server view management parts to new controller and clean up code  
						
						
						
						
					 
					
						2019-11-24 12:50:16 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f0044575f 
							
						 
					 
					
						
						
							
							Update server creation data logic  
						
						
						
						
					 
					
						2019-11-16 13:33:01 -08:00 
						 
				 
			
				
					
						
							
							
								AreYouScared 
							
						 
					 
					
						
						
						
						
							
						
						
							03dba1a00a 
							
						 
					 
					
						
						
							
							Fixed has servers error message  
						
						... 
						
						
						
						Fixed "Nest has active servers error" 
						
						
					 
					
						2019-10-04 01:14:47 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							67ff67a1bd 
							
						 
					 
					
						
						
							
							Add endpoints to return a server's egg configuration  
						
						
						
						
					 
					
						2019-09-22 15:30:53 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7543ef085d 
							
						 
					 
					
						
						
							
							Format files  
						
						
						
						
					 
					
						2019-09-05 21:32:57 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bd8b708c32 
							
						 
					 
					
						
						
							
							[L6] Update cache methods to use defined times and not ints  
						
						
						
						
					 
					
						2019-09-04 20:24:46 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							81143e231a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2019-08-04 13:49:26 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb81e1ed20 
							
						 
					 
					
						
						
							
							Support special characters in database password,  closes   #1508  
						
						
						
						
					 
					
						2019-08-03 14:42:32 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							81409947cf 
							
						 
					 
					
						
						
							
							Default to OOM killer being disabled, add back configuration option per-server  
						
						
						
						
					 
					
						2019-08-03 13:41:24 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							47c12929c4 
							
						 
					 
					
						
						
							
							Fix two-factor token creation for iOS devices,  closes   #1624  
						
						
						
						
					 
					
						2019-08-03 12:37:02 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							02ac308042 
							
						 
					 
					
						
						
							
							Fix database host modification not properly showing SQL errors  
						
						... 
						
						
						
						This is caused by an old bug relating to not rolling back transactions properly causing session data to not be flashed back to the user properly. 
						
						
					 
					
						2019-08-03 12:33:28 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48c39abfcb 
							
						 
					 
					
						
						
							
							Add database password rotation to view  
						
						
						
						
					 
					
						2019-07-27 15:17:50 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							56640253b9 
							
						 
					 
					
						
						
							
							Merge branch 'release/v0.7.14' into feature/react  
						
						
						
						
					 
					
						2019-06-22 12:28:44 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							092e7e79ff 
							
						 
					 
					
						
						
							
							Change 2FA service to generate the secret on our own and use an external QR service to display the image  
						
						
						
						
					 
					
						2019-06-21 21:55:09 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							71eae1eb68 
							
						 
					 
					
						
						
							
							Update TwoFactorSetupService.php  
						
						
						
						
					 
					
						2019-05-01 20:57:54 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5c99cae779 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/vuejs  
						
						
						
						
					 
					
						2019-05-01 20:57:49 -07:00 
						 
				 
			
				
					
						
							
							
								saibotk 
							
						 
					 
					
						
						
						
						
							
						
						
							7277b6449b 
							
						 
					 
					
						
						
							
							Replace 2FA QR Code generation ( #1548 )  
						
						... 
						
						
						
						Due to the Google API for generating the 2FA QR code will be shut down on 14.04.2019, this adds the package "pragmarx/google2fa-qrcode" and updates "pragmarx/google2fa" to version 5.x. 
Due to now using BaconQR, Pterodactyl now needs the php-imagick extension to render the images. 
						
						
					 
					
						2019-04-27 14:18:12 -04:00 
						 
				 
			
				
					
						
							
							
								Arnaud Lier 
							
						 
					 
					
						
						
						
						
							
						
						
							4460b6835a 
							
						 
					 
					
						
						
							
							Match original database password length when doing a password reset ( #1509 )  
						
						
						
						
					 
					
						2019-03-23 14:04:57 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							21ffa08d66 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/vuejs  
						
						
						
						
					 
					
						2018-12-16 14:20:35 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7c73f21b30 
							
						 
					 
					
						
						
							
							Fix Node daemon secret not being reset,  closes   #1390  
						
						
						
						
					 
					
						2018-12-02 13:40:12 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd9730b5f8 
							
						 
					 
					
						
						
							
							Return permissions string when authenticating SFTP  
						
						
						
						
					 
					
						2018-11-04 11:09:42 -08:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5ca13839cf 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/vue-serverview  
						
						
						
						
					 
					
						2018-09-05 21:34:59 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c6112b4234 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2018-09-03 14:59:00 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3bb9bf04e5 
							
						 
					 
					
						
						
							
							Pass the updated model through for updating node config, rather than old model, ref  #1237  
						
						
						
						
					 
					
						2018-09-03 14:54:50 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5bd3f59455 
							
						 
					 
					
						
						
							
							Fix schedules running twice,  closes   #1288  
						
						
						
						
					 
					
						2018-09-03 14:32:33 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							413a22a3d5 
							
						 
					 
					
						
						
							
							Changes to job running to clean up code  
						
						
						
						
					 
					
						2018-09-03 14:04:25 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bcb3f5d5fa 
							
						 
					 
					
						
						
							
							Fix handling of times  
						
						
						
						
					 
					
						2018-08-31 21:12:10 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							178b8f8ce6 
							
						 
					 
					
						
						
							
							More logical time handling  
						
						
						
						
					 
					
						2018-08-31 21:00:13 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							603b8a3094 
							
						 
					 
					
						
						
							
							Merge branch 'feature/vuejs' into feature/vuejs-account  
						
						
						
						
					 
					
						2018-07-02 21:01:04 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48cb01f438 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/vuejs  
						
						
						
						
					 
					
						2018-07-02 21:00:42 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d2bc791d74 
							
						 
					 
					
						
						
							
							Fix links sent to users when accounts are created  
						
						... 
						
						
						
						closes  #1093  
					
						2018-06-30 18:47:31 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							304d947536 
							
						 
					 
					
						
						
							
							Allow creating subuser with no permissions  
						
						
						
						
					 
					
						2018-06-30 18:25:46 -07:00 
						 
				 
			
				
					
						
							
							
								Sergzy 
							
						 
					 
					
						
						
						
						
							
						
						
							bad9ae58e8 
							
						 
					 
					
						
						
							
							Fix environment_variables name ( #1212 )  
						
						
						
						
					 
					
						2018-06-30 13:25:40 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7711b697ad 
							
						 
					 
					
						
						
							
							Finalize two-factor handling on account.  
						
						
						
						
					 
					
						2018-06-20 23:05:35 -07:00