Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							32dec97e46
							
						
					 | 
					
						
						
							
							Improved database mechanics in admin CP for server view
						
						
						
						
						
						
					 | 
					
						2017-03-05 16:37:40 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5c32a91200
							
						
					 | 
					
						
						
							
							JS code updates
						
						
						
						
						
						
					 | 
					
						2017-03-05 00:04:26 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e688468920
							
						
					 | 
					
						
						
							
							Push updated server views
						
						
						
						
						
						
					 | 
					
						2017-03-04 19:03:49 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e6d3663b3b
							
						
					 | 
					
						
						
							
							Model and template cleanup
						
						
						
						
						
						
					 | 
					
						2017-03-03 23:37:41 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							b91e3d95f8
							
						
					 | 
					
						
						
							
							fix revealing module and jquery3 of 2fa-modal
						
						
						
						
						
						
					 | 
					
						2017-03-03 23:42:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							799f2ee6d9
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into feature/admin-retheme
						
						
						
						
						
						
						
						# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css 
						
						
					 | 
					
						2017-03-03 17:35:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fd9f1a68eb
							
						
					 | 
					
						
						
							
							Implement node view, cleanup other files.
						
						
						
						
						
						
						
						Still in progress, need to do a lot of controller cleanup first and add
node deletion as well. 
						
						
					 | 
					
						2017-03-03 17:30:41 -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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9f54ff236a
							
						
					 | 
					
						
						
							
							Add back manage and delete tabs to server view
						
						
						
						
						
						
						
						Will come back to deal with Startup and Database tabs at a later date. 
						
						
					 | 
					
						2017-02-25 14:14:07 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fb21bf9282
							
						
					 | 
					
						
						
							
							Begin implementation of server admin view
						
						
						
						
						
						
						
						Currently completed tabs: About, Details, Build Configuration 
						
						
					 | 
					
						2017-02-25 00:48:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cb6b44d4f0
							
						
					 | 
					
						
						
							
							Completed new server page with new theme.
						
						
						
						
						
						
					 | 
					
						2017-02-24 18:19:03 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							58999913ba
							
						
					 | 
					
						
						
							
							More improvements to add server page.
						
						
						
						
						
						
					 | 
					
						2017-02-23 22:52:05 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b926d432e8
							
						
					 | 
					
						
						
							
							Thats enough re-theming for the day...
						
						
						
						
						
						
					 | 
					
						2017-02-18 19:31:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							911434d033
							
						
					 | 
					
						
						
							
							Only apache could manage to do something this ridiculous
						
						
						
						
						
						
					 | 
					
						2017-02-18 12:47:49 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							99497adcb2
							
						
					 | 
					
						
						
							
							Show proper server status when viewing listing.
						
						
						
						
						
						
						
						closes #308 
						
						
					 | 
					
						2017-02-17 20:34:57 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							008cccb098
							
						
					 | 
					
						
						
							
							Fix up email sending and add more notifications to the panel.
						
						
						
						
						
						
						
						Closes #265 
						
						
					 | 
					
						2017-02-17 19:23:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							232e9a05ed
							
						
					 | 
					
						
						
							
							Update filemanager to be a little cleaner
						
						
						
						
						
						
					 | 
					
						2017-02-17 13:08:07 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ebe88bb1a8
							
						
					 | 
					
						
						
							
							Cleaner navigation bar for logout/admin
						
						
						
						
						
						
					 | 
					
						2017-02-16 18:19:52 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c8ae776ab8
							
						
					 | 
					
						
						
							
							Fix settings redirection for server
						
						
						
						
						
						
					 | 
					
						2017-02-16 14:04:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							516e2dc5ee
							
						
					 | 
					
						
						
							
							Add back API key deletion
						
						
						
						
						
						
					 | 
					
						2017-02-16 12:57:48 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							19d352619e
							
						
					 | 
					
						
						
							
							More singularization and correct file names.
						
						
						
						
						
						
					 | 
					
						2017-02-12 16:03:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8ba479e51f
							
						
					 | 
					
						
						
							
							Singularize model names.
						
						
						
						
						
						
					 | 
					
						2017-02-12 16:02:23 -05: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9225e65df
							
						
					 | 
					
						
						
							
							move phraseapp js into own file
						
						
						
						
						
						
					 | 
					
						2017-02-02 15:30:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a1a81ac980
							
						
					 | 
					
						
						
							
							Fix auth page not remembering users.
						
						
						
						
						
						
					 | 
					
						2017-02-01 22:28:50 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6d5ffaebb
							
						
					 | 
					
						
						
							
							derp: add jquery 3.1.1 files
						
						
						
						
						
						
					 | 
					
						2017-01-29 01:21:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cd9e8ca88
							
						
					 | 
					
						
						
							
							switch to jQuery 3.1.1 on new theme
						
						
						
						
						
						
						
						will resolve #113 
						
						
					 | 
					
						2017-01-29 01:20:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							c62312b8af
							
						
					 | 
					
						
						
							
							redesign parts of the file manager
						
						
						
						
						
						
						
						ignore yarn.lock file 
						
						
					 | 
					
						2017-01-27 00:44:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c1559c922
							
						
					 | 
					
						
						
							
							convert frontend javascript into revealing module pattern
						
						
						
						
						
						
					 | 
					
						2017-01-27 00:44:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							344e3b4330
							
						
					 | 
					
						
						
							
							add console notification on new output that is out of view
						
						
						
						
						
						
						
						fix the revealing module pattern (browser cache 😒)
change graph colors to theme primary color
move Socket.on(‚console’) to console.js 
						
						
					 | 
					
						2017-01-26 22:57:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							5142dce0e0
							
						
					 | 
					
						
						
							
							reorganize code of console module
						
						
						
						
						
						
					 | 
					
						2017-01-26 22:20:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							96f5d15811
							
						
					 | 
					
						
						
							
							switch console javascript code to revealing module pattern to avoid global variables
						
						
						
						
						
						
					 | 
					
						2017-01-26 22:12:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bf7b58470a
							
						
					 | 
					
						
						
							
							Update copyright headers
						
						
						
						
						
						
					 | 
					
						2017-01-24 17:57:08 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							986d3c6e23
							
						
					 | 
					
						
						
							
							Fix babel setup for filemanager
						
						
						
						
						
						
					 | 
					
						2017-01-24 00:11:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ae8f53d8ef
							
						
					 | 
					
						
						
							
							Prevent clicky mcgee from clicking too quickly
						
						
						
						
						
						
					 | 
					
						2017-01-23 22:26:48 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5f1bfcf980
							
						
					 | 
					
						
						
							
							Much cleaner code for updating user details front-end
						
						
						
						
						
						
					 | 
					
						2017-01-22 16:16:43 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fa0f32584e
							
						
					 | 
					
						
						
							
							Update laroute
						
						
						
						
						
						
					 | 
					
						2017-01-21 15:44:06 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0e23f87724
							
						
					 | 
					
						
						
							
							Add task management views
						
						
						
						
						
						
					 | 
					
						2017-01-21 15:40:46 -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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5567269bf3
							
						
					 | 
					
						
						
							
							Fix menu toggle element element hiding, better mobile support
						
						
						
						
						
						
					 | 
					
						2017-01-19 23:19:26 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							da92796ca1
							
						
					 | 
					
						
						
							
							Better file upload handling, add touch target
						
						
						
						
						
						
					 | 
					
						2017-01-19 22:58:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6149400ced
							
						
					 | 
					
						
						
							
							prevent accidentally leaving the page when uploading file
						
						
						
						
						
						
					 | 
					
						2017-01-19 22:22:11 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							83c776fc82
							
						
					 | 
					
						
						
							
							Fix up most of the file manager
						
						
						
						
						
						
					 | 
					
						2017-01-19 16:58:57 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							042c28ca43
							
						
					 | 
					
						
						
							
							Add Socket.io alert
						
						
						
						
						
						
					 | 
					
						2017-01-18 21:12:58 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |