Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							19567ee311 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix/trusted-proxies  
						
						
						
						
					 
					
						2017-02-03 00:38:58 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							8cac2a3669 
							
						 
					 
					
						
						
							
							Merge pull request  #285  from Pterodactyl/feature/phrase-in-context  
						
						... 
						
						
						
						add phraseapp in context editor 
						
						
					 
					
						2017-02-03 00:36:50 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							644ee85f59 
							
						 
					 
					
						
						
							
							Fix for StyleCI  
						
						
						
						
					 
					
						2017-02-02 18:25:46 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d4bcf0be59 
							
						 
					 
					
						
						
							
							Initial implementation of improved sever model and logic  
						
						
						
						
					 
					
						2017-02-02 18:21:36 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1000dd8a 
							
						 
					 
					
						
						
							
							make dane and styleci happy  
						
						
						
						
					 
					
						2017-02-03 00:08:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							7f0608d412 
							
						 
					 
					
						
						
							
							better naming of PhraseApp related stuff  
						
						
						
						
					 
					
						2017-02-02 23:14:53 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7f51e5df62 
							
						 
					 
					
						
						
							
							API tweaks to return more relevant information on server listing  
						
						
						
						
					 
					
						2017-02-02 16:24:08 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							32c21baab0 
							
						 
					 
					
						
						
							
							Return packs associated with a service when viewing it on the API.  
						
						
						
						
					 
					
						2017-02-02 16:01:18 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6220f710df 
							
						 
					 
					
						
						
							
							Cache configuration file when editing environment or mail settings.  
						
						
						
						
					 
					
						2017-02-02 15:06:35 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							8fc30fbe3a 
							
						 
					 
					
						
						
							
							add phraseapp in context editor  
						
						
						
						
					 
					
						2017-02-02 15:05:33 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4be9e30eee 
							
						 
					 
					
						
						
							
							Include that 30 second limit on other 2FA checks  
						
						
						
						
					 
					
						2017-02-01 23:05:19 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a93adce303 
							
						 
					 
					
						
						
							
							Only allow up to 30 seconds of overlap on comparing the 2FA tokens.  
						
						
						
						
					 
					
						2017-02-01 23:02:54 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4abdee0efb 
							
						 
					 
					
						
						
							
							Better 2FA implementation on logins  
						
						
						
						
					 
					
						2017-02-01 22:58:48 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							24650b67be 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix/trusted-proxies  
						
						... 
						
						
						
						sorry 
						
						
					 
					
						2017-02-01 20:35:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab4faad8a 
							
						 
					 
					
						
						
							
							remove TRUSTED_PROXIES from .env.example  
						
						... 
						
						
						
						make style ci happy 
						
						
					 
					
						2017-02-01 20:31:24 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							ee26a7e8dd 
							
						 
					 
					
						
						
							
							add fideloper/proxy to support reverse proxies and load balancers  
						
						
						
						
					 
					
						2017-02-01 20:10:28 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							e5ed1c7f6a 
							
						 
					 
					
						
						
							
							One day eslint will have a PHP counterpart that works in Atom...  🤔  
						
						
						
						
					 
					
						2017-01-31 20:04:34 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1679d866a5 
							
						 
					 
					
						
						
							
							Improved gzip detection  
						
						
						
						
					 
					
						2017-01-27 16:47:50 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4b0197f2be 
							
						 
					 
					
						
						
							
							Implement basic security policy on daemon remote routes  
						
						
						
						
					 
					
						2017-01-27 16:34:46 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9087feec4f 
							
						 
					 
					
						
						
							
							Remove build settings from packs.  
						
						
						
						
					 
					
						2017-01-27 16:21:25 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a6d62fded 
							
						 
					 
					
						
						
							
							Fix fatal error when trying to send server creation notification  
						
						
						
						
					 
					
						2017-01-27 16:21:15 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e6d3e75024 
							
						 
					 
					
						
						
							
							Add new daemon routes for pack handling  
						
						
						
						
					 
					
						2017-01-25 18:25:34 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							95d0c646f9 
							
						 
					 
					
						
						
							
							Require packs to be a tarball  
						
						
						
						
					 
					
						2017-01-25 18:25:34 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							96e50506a1 
							
						 
					 
					
						
						
							
							Move notification email of server created into the event listener  
						
						
						
						
					 
					
						2017-01-25 18:25:34 -05:00 
						 
				 
			
				
					
						
							
							
								Emmet Young 
							
						 
					 
					
						
						
						
						
							
						
						
							58de6125c2 
							
						 
					 
					
						
						
							
							Location should be validated on creation of a server,  
						
						
						
						
					 
					
						2017-01-25 22:01:57 +11:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a137e6ed72 
							
						 
					 
					
						
						
							
							Add base implementation of extendable events classes  
						
						... 
						
						
						
						Modified server deletion to use internal event handlers from the
Eloquent models themselves. Also added a few preliminary event handlers
in the `Pterodactyl\Events\<USer|Server> namespace that users can hook
into in EventServiceProvider to perform their own actions as they
please (such as push notifications and such). 
						
						
					 
					
						2017-01-24 19:15:03 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bf7b58470a 
							
						 
					 
					
						
						
							
							Update copyright headers  
						
						
						
						
					 
					
						2017-01-24 17:57:08 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							b9512dccb8 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #269 )  
						
						
						
						
					 
					
						2017-01-23 17:11:25 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							06232b84c2 
							
						 
					 
					
						
						
							
							Merge pull request  #268  from hammerdawn/ThemeFixes  
						
						... 
						
						
						
						Repair the admin side add user functionality. 
						
						
					 
					
						2017-01-23 17:10:32 -05:00 
						 
				 
			
				
					
						
							
							
								Emmet Young 
							
						 
					 
					
						
						
						
						
							
						
						
							9c87e03c0c 
							
						 
					 
					
						
						
							
							Repair the admin side add user functionality.  
						
						
						
						
					 
					
						2017-01-23 13:24:14 +11:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							d21e6b8c90 
							
						 
					 
					
						
						
							
							Merge pull request  #267  from hammerdawn/ThemeFixes  
						
						... 
						
						
						
						Theme Changes 
						
						
					 
					
						2017-01-22 19:59:37 -05:00 
						 
				 
			
				
					
						
							
							
								Emmet Young 
							
						 
					 
					
						
						
						
						
							
						
						
							921c7b1725 
							
						 
					 
					
						
						
							
							Configuration JSON should be including the FQDN instead of localhost for the certificate path.  
						
						
						
						
					 
					
						2017-01-23 11:14:55 +11:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f1bfcf980 
							
						 
					 
					
						
						
							
							Much cleaner code for updating user details front-end  
						
						
						
						
					 
					
						2017-01-22 16:16:43 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9e54dabe5b 
							
						 
					 
					
						
						
							
							Display if subusers are using 2FA  
						
						
						
						
					 
					
						2017-01-22 16:16:26 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							edd26893a5 
							
						 
					 
					
						
						
							
							Adjust default theme in .env and note that http:// is required on URLs  
						
						
						
						
					 
					
						2017-01-22 13:51:56 -05:00 
						 
				 
			
				
					
						
							
							
								Emmet Young 
							
						 
					 
					
						
						
						
						
							
						
						
							9025f1f583 
							
						 
					 
					
						
						
							
							Repair user creation functionality  
						
						... 
						
						
						
						Repair functionality of the make user console command (pterodactyl:user)
Fix up the user repository, was using the old $password instead of the changed format $data['password']
Change User model to allow root_admin to be a fillable item. 
						
						
					 
					
						2017-01-23 00:47:09 +11:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							355697dbb5 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #260 )  
						
						
						
						
					 
					
						2017-01-21 15:56:32 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e23f87724 
							
						 
					 
					
						
						
							
							Add task management views  
						
						
						
						
					 
					
						2017-01-21 15:40:46 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db7b741b28 
							
						 
					 
					
						
						
							
							Show server status in sidebar properly on subuser views  
						
						
						
						
					 
					
						2017-01-21 13:49:14 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e9069cced 
							
						 
					 
					
						
						
							
							Subuser updates  
						
						
						
						
					 
					
						2017-01-21 00:04:09 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d2278ba3e 
							
						 
					 
					
						
						
							
							Add subuser list and new subuser views  
						
						... 
						
						
						
						Holy 🐄  translations are annoying to implement for these views. 
						
						
					 
					
						2017-01-20 23:39:37 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							994588c82d 
							
						 
					 
					
						
						
							
							Set the old theme on admin center until new theme is done  
						
						
						
						
					 
					
						2017-01-20 17:19:42 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							91178d78a4 
							
						 
					 
					
						
						
							
							Add support for creating files via file manager  
						
						
						
						
					 
					
						2017-01-20 17:10:14 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							83c776fc82 
							
						 
					 
					
						
						
							
							Fix up most of the file manager  
						
						
						
						
					 
					
						2017-01-19 16:58:57 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							88378ce983 
							
						 
					 
					
						
						
							
							Add allocations tab  
						
						... 
						
						
						
						Strips some core allocation features for now, will be added back with
more features once the theme is done. 
						
						
					 
					
						2017-01-18 20:45:10 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							c0df57c087 
							
						 
					 
					
						
						
							
							add isRootAdmin() method to User model to get rid of User->root_admin === 1  
						
						
						
						
					 
					
						2017-01-18 21:13:05 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f6600f447f 
							
						 
					 
					
						
						
							
							Add Startup Params view  
						
						... 
						
						
						
						Translations might be the end of us. 
						
						
					 
					
						2017-01-17 19:30:27 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							e2eff27a56 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI  
						
						
						
						
					 
					
						2017-01-17 23:21:33 +00:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							515e543c7f 
							
						 
					 
					
						
						
							
							Add SFTP and Database management pages to new theme.  
						
						
						
						
					 
					
						2017-01-15 20:28:54 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c7f3bb5112 
							
						 
					 
					
						
						
							
							New theme assigned to server console page.  
						
						
						
						
					 
					
						2017-01-15 18:52:22 -05:00