Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4898d4f9d2 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/Pterodactyl/Panel  into develop  
						
						
						
						
					 
					
						2017-11-05 12:43:03 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22ba6cbecb 
							
						 
					 
					
						
						
							
							Fix subuser URL redirect,  closes   #723  
						
						
						
						
					 
					
						2017-11-05 12:42:58 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aa86fe83e8 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #732 )  
						
						... 
						
						
						
						[ci skip] [skip ci] 
						
						
					 
					
						2017-11-05 13:40:12 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6409fffdad 
							
						 
					 
					
						
						
							
							Implement fix to allow root admins to view all servers.  
						
						... 
						
						
						
						closes  #722  
					
						2017-11-05 12:38:39 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							799b8a7f5f 
							
						 
					 
					
						
						
							
							database command fixes  
						
						
						
						
					 
					
						2017-11-04 17:41:52 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ecdd133b75 
							
						 
					 
					
						
						
							
							Fix daemon auth  
						
						
						
						
					 
					
						2017-11-04 17:16:44 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1438a50ae9 
							
						 
					 
					
						
						
							
							More fixes  
						
						
						
						
					 
					
						2017-11-04 16:46:18 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bda42b673f 
							
						 
					 
					
						
						
							
							Unset redis password if empty.  
						
						
						
						
					 
					
						2017-11-04 16:40:48 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69cd330eb8 
							
						 
					 
					
						
						
							
							Fix setup command issues  
						
						
						
						
					 
					
						2017-11-04 16:27:15 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6a2cb72ede 
							
						 
					 
					
						
						
							
							Fix debug bar getting loaded in production  
						
						
						
						
					 
					
						2017-11-04 14:21:30 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f5b20e38c4 
							
						 
					 
					
						
						
							
							Fix failing tests due to way nest creation worked  
						
						
						
						
					 
					
						2017-11-04 13:01:54 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							233cbfda09 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/fixed-seeders  
						
						
						
						
					 
					
						2017-11-04 12:50:32 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							71b90650de 
							
						 
					 
					
						
						
							
							Fix failing test suite  
						
						
						
						
					 
					
						2017-11-04 12:49:05 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f8c89f8331 
							
						 
					 
					
						
						
							
							Add support for seeding nests and eggs  
						
						
						
						
					 
					
						2017-11-03 23:07:18 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7882250baf 
							
						 
					 
					
						
						
							
							Add more middleware tests  
						
						
						
						
					 
					
						2017-11-03 18:16:49 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							133fd17da6 
							
						 
					 
					
						
						
							
							Fix subuser unit tests  
						
						
						
						
					 
					
						2017-11-03 16:52:18 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							54228e8124 
							
						 
					 
					
						
						
							
							Fix multiple controller unit test failures  
						
						
						
						
					 
					
						2017-11-03 16:43:28 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7b3393aff9 
							
						 
					 
					
						
						
							
							More middleware tests  
						
						
						
						
					 
					
						2017-11-01 20:45:43 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d844a36167 
							
						 
					 
					
						
						
							
							Begin adding unit tests for middleware  
						
						
						
						
					 
					
						2017-10-29 21:40:34 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e9aecfe6db 
							
						 
					 
					
						
						
							
							Shorten imports  
						
						
						
						
					 
					
						2017-10-29 15:57:43 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							79decafdc8 
							
						 
					 
					
						
						
							
							Update all the middlewares  
						
						
						
						
					 
					
						2017-10-29 12:37:25 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0d03513e4 
							
						 
					 
					
						
						
							
							Cleanup frontend controllers and middleware  
						
						
						
						
					 
					
						2017-10-27 21:42:53 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fa62a0982e 
							
						 
					 
					
						
						
							
							Refactor startup modification and environment variable services  
						
						... 
						
						
						
						Better setup, more flexibility, more tests. 
						
						
					 
					
						2017-10-26 23:49:54 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							508ff8cfb3 
							
						 
					 
					
						
						
							
							Finish front-end server modification changes.  
						
						... 
						
						
						
						Everything is back to the point that it was before this massive code overhaul began. FInal steps before merging this into develop will be some unit tests. 
						
						
					 
					
						2017-10-25 22:33:28 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							058e490ec4 
							
						 
					 
					
						
						
							
							Implement Panel changes to support internal SFTP subsystem on Daemon ( #703 )  
						
						
						
						
					 
					
						2017-10-25 00:35:25 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							57db949a9c 
							
						 
					 
					
						
						
							
							Tests a'hoy  
						
						
						
						
					 
					
						2017-10-23 21:10:32 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							532025a348 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2017-10-23 20:12:15 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d50ea18598 
							
						 
					 
					
						
						
							
							Add support for changing the server default allocation as a normal user  
						
						
						
						
					 
					
						2017-10-20 21:32:57 -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 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5e712f0bb1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/service-export-import  
						
						
						
						
					 
					
						2017-10-17 21:31:35 -05:00 
						 
				 
			
				
					
						
							
							
								arioioio 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fdf64435 
							
						 
					 
					
						
						
							
							Redirect to users list on user deletion ( #680 )  
						
						... 
						
						
						
						closes  #675  
					
						2017-10-09 15:13:52 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b602ea1f66 
							
						 
					 
					
						
						
							
							Trying to make tests not fail for random reasons?  
						
						
						
						
					 
					
						2017-10-09 00:02:33 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e01d7497f5 
							
						 
					 
					
						
						
							
							Add ability to update an Egg by re-uploading a file.  
						
						
						
						
					 
					
						2017-10-08 23:50:52 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e2cb789b2b 
							
						 
					 
					
						
						
							
							Stop Dane from submitting invalid arrays and breaking the entire application...  
						
						
						
						
					 
					
						2017-10-08 23:44:27 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aaf96669d4 
							
						 
					 
					
						
						
							
							Misc fixes  
						
						
						
						
					 
					
						2017-10-08 21:36:22 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							864513c44b 
							
						 
					 
					
						
						
							
							Fix failing test suite  
						
						
						
						
					 
					
						2017-10-08 20:57:59 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6e02e9491a 
							
						 
					 
					
						
						
							
							Egg tests updated  
						
						
						
						
					 
					
						2017-10-08 15:29:46 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							787346525b 
							
						 
					 
					
						
						
							
							Update a batch of failing tests  
						
						
						
						
					 
					
						2017-10-07 23:29:08 -05:00 
						 
				 
			
				
					
						
							
							
								Anand Capur 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b08d6a4b9d 
							
						 
					 
					
						
						
							
							Make config caching less aggressive  
						
						
						
						
					 
					
						2017-10-07 20:00:44 -07:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c19c423568 
							
						 
					 
					
						
						
							
							More fixes  
						
						
						
						
					 
					
						2017-10-07 18:08:19 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17642bffe7 
							
						 
					 
					
						
						
							
							More code updates  
						
						
						
						
					 
					
						2017-10-07 17:21:41 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cc297eea09 
							
						 
					 
					
						
						
							
							Misc changes  
						
						
						
						
					 
					
						2017-10-07 16:19:07 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b8464ea3a 
							
						 
					 
					
						
						
							
							Nest & Egg management working through the ACP now.  
						
						
						
						
					 
					
						2017-10-07 16:16:51 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							df87ea0867 
							
						 
					 
					
						
						
							
							This breaks literally the entire panel.  
						
						
						
						
					 
					
						2017-10-06 23:57:53 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							344c1a9885 
							
						 
					 
					
						
						
							
							First push before  🥚  
						
						
						
						
					 
					
						2017-10-06 21:22:32 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							675e780946 
							
						 
					 
					
						
						
							
							Fix test failures  
						
						
						
						
					 
					
						2017-10-06 00:16:22 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							38075c6b9f 
							
						 
					 
					
						
						
							
							Update panel to send correct service option configuration to the daemon.  
						
						
						
						
					 
					
						2017-10-05 23:09:43 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							29cfae86b1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/service-export-import  
						
						
						
						
					 
					
						2017-10-05 00:17:17 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fbd5c25ed0 
							
						 
					 
					
						
						
							
							Finalize tests  
						
						
						
						
					 
					
						2017-10-04 23:52:25 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							609bf32843 
							
						 
					 
					
						
						
							
							Add test for service option exporter  
						
						
						
						
					 
					
						2017-10-04 23:42:04 -05:00