Michael (Parker) Parker 
							
						 
					 
					
						
						
						
						
							
						
						
							9773ce4633 
							
						 
					 
					
						
						
							
							Clearing up language  
						
						
						
						
					 
					
						2017-05-29 11:45:05 -04:00 
						 
				 
			
				
					
						
							
							
								Hunter Wignall 
							
						 
					 
					
						
						
						
						
							
						
						
							a35788da34 
							
						 
					 
					
						
						
							
							LANG: Missing 'A' in 'Allows' ( #402 )  
						
						
						
						
					 
					
						2017-04-23 16:30:32 -04:00 
						 
				 
			
				
					
						
							
							
								Hunter Wignall 
							
						 
					 
					
						
						
						
						
							
						
						
							d76bcf4cf9 
							
						 
					 
					
						
						
							
							Set drop-down menu option to be same as help text below ( #400 )  
						
						
						
						
					 
					
						2017-04-21 22:46:06 -04:00 
						 
				 
			
				
					
						
							
							
								kasper Franz 
							
						 
					 
					
						
						
						
						
							
						
						
							2006920427 
							
						 
					 
					
						
						
							
							added a check if the task has run yet ( #385 )  
						
						... 
						
						
						
						* added a null check on the last_run
* corrected a mistake made when changing the file
* another mistake :/
* changed to be less specific and so it checks against the value instead of > 
						
						
					 
					
						2017-04-17 12:03:11 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f58858206e 
							
						 
					 
					
						
						
							
							Add console popout option.  
						
						... 
						
						
						
						Popout: https://s3.kelp.in/IrTyE.png 
Menu: https://s3.kelp.in/JYwlC.png 
Menu Hover: https://s3.kelp.in/cPtSf.png  
						
						
					 
					
						2017-04-15 18:23:29 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f1024ad1a8 
							
						 
					 
					
						
						
							
							Improved login controller func. for 2FA, throws Failed event correctly now  
						
						
						
						
					 
					
						2017-04-14 14:33:15 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							722fd614a1 
							
						 
					 
					
						
						
							
							Add new dynamic view for creating API keys  
						
						
						
						
					 
					
						2017-04-09 18:59:54 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5f3678c62 
							
						 
					 
					
						
						
							
							Fix login routes  
						
						
						
						
					 
					
						2017-04-01 21:18:56 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							75119611b9 
							
						 
					 
					
						
						
							
							Update API settings page to display checkboxes correctly.  
						
						
						
						
					 
					
						2017-03-31 21:46:40 -04:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							207e0131fc 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset  
						
						
						
						
					 
					
						2017-03-31 12:20:41 +02:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							142cbb0641 
							
						 
					 
					
						
						
							
							Add invisible ReCAPTCHA to login and password reset  
						
						
						
						
					 
					
						2017-03-31 12:19:44 +02:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							95c739a3f3 
							
						 
					 
					
						
						
							
							Update subusers view  
						
						
						
						
					 
					
						2017-03-30 15:31:02 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a5902bf39c 
							
						 
					 
					
						
						
							
							Show indicator of user permissions on server when listing  
						
						
						
						
					 
					
						2017-03-17 15:34:29 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							955d89c0c6 
							
						 
					 
					
						
						
							
							Move everything over to pterodactyl theme  
						
						
						
						
					 
					
						2017-03-16 19:48:24 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fcadee7e67 
							
						 
					 
					
						
						
							
							Fix front and backend views with new service variable setups  
						
						
						
						
					 
					
						2017-03-12 19:34:06 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							349b36d38a 
							
						 
					 
					
						
						
							
							Added startup management, cleaned up code.  
						
						... 
						
						
						
						Refactored entire startup repository code block to be more efficient
and cleaner. Also includes modifications to front-end to make it match
backend name and design. 
						
						
					 
					
						2017-03-04 23:45:25 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							3a88deb97a 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/new-theme  
						
						... 
						
						
						
						# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php 
						
						
					 
					
						2017-03-03 23:08:24 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ebe88bb1a8 
							
						 
					 
					
						
						
							
							Cleaner navigation bar for logout/admin  
						
						
						
						
					 
					
						2017-02-16 18:19:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf8b473d4 
							
						 
					 
					
						
						
							
							fix translations for login field  
						
						
						
						
					 
					
						2017-02-16 20:46:37 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							0b2c5279a8 
							
						 
					 
					
						
						
							
							allow to use the username for login as well  
						
						... 
						
						
						
						add translation strings 
						
						
					 
					
						2017-02-16 20:40:21 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4abdee0efb 
							
						 
					 
					
						
						
							
							Better 2FA implementation on logins  
						
						
						
						
					 
					
						2017-02-01 22:58:48 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							c62312b8af 
							
						 
					 
					
						
						
							
							redesign parts of the file manager  
						
						... 
						
						
						
						ignore yarn.lock file 
						
						
					 
					
						2017-01-27 00:44:59 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e9069cced 
							
						 
					 
					
						
						
							
							Subuser updates  
						
						
						
						
					 
					
						2017-01-21 00:04:09 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							95f574ec67 
							
						 
					 
					
						
						
							
							Sidebar and API View tweaks  
						
						
						
						
					 
					
						2017-01-20 23:48:12 -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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							76cef7bf1d 
							
						 
					 
					
						
						
							
							add redesigned base.api.new view  
						
						... 
						
						
						
						add translations 
						
						
					 
					
						2017-01-19 01:06:26 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d3d1b88135 
							
						 
					 
					
						
						
							
							Add 404 and 403 error pages  
						
						
						
						
					 
					
						2017-01-17 20:28:49 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							542b919bd1 
							
						 
					 
					
						
						
							
							Add translations for database overview  
						
						
						
						
					 
					
						2017-01-17 19:46:42 -05: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 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							31b4589eab 
							
						 
					 
					
						
						
							
							Contribution to feature/new-theme ( #254 )  
						
						... 
						
						
						
						* add translation to navigation
* redesign base.api.index view
add translations
* remove license derp
* translate never in base.api.index view
* simplify user drop down for now
add translations 
						
						
					 
					
						2017-01-17 18:21:05 -05: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 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2fc852c6a4 
							
						 
					 
					
						
						
							
							Push 'Account' and 'Security' pages as well as 'My Servers'  
						
						
						
						
					 
					
						2017-01-15 14:09:57 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							457ed28b0b 
							
						 
					 
					
						
						
							
							Initial change of theme.  
						
						... 
						
						
						
						Only themed pages currently are login and reset password pages. 
						
						
					 
					
						2017-01-14 21:32:33 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							06bdadb92f 
							
						 
					 
					
						
						
							
							Add missing language string in English  
						
						
						
						
					 
					
						2017-01-03 15:02:51 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							920ed824d6 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI  
						
						
						
						
					 
					
						2016-12-30 22:19:23 +00:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1dff5cda0 
							
						 
					 
					
						
						
							
							Push updated languages  
						
						
						
						
					 
					
						2016-12-30 17:17:36 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							c1fb0a665f 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI  
						
						
						
						
					 
					
						2016-12-07 22:46:38 +00:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							231bc79155 
							
						 
					 
					
						
						
							
							Add german translation ( #91 )  
						
						
						
						
					 
					
						2016-09-25 20:32:32 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							f6be06164f 
							
						 
					 
					
						
						
							
							fix user controller;  closes   #58 ,  closes   #59  
						
						
						
						
					 
					
						2016-02-21 01:15:37 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Parker 
							
						 
					 
					
						
						
						
						
							
						
						
							ea30ee17f7 
							
						 
					 
					
						
						
							
							Fix spelling  
						
						... 
						
						
						
						Per DireDoesGames fixing a spelling error 
						
						
					 
					
						2016-02-01 19:10:00 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							40c68a5391 
							
						 
					 
					
						
						
							
							Add title to copyright  
						
						
						
						
					 
					
						2016-01-20 16:05:16 -05:00