Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f5a4ec981d 
							
						 
					 
					
						
						
							
							Add ability to create new service variable.  
						
						
						
						
					 
					
						2017-03-12 16:28:38 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b1b1f448e9 
							
						 
					 
					
						
						
							
							Send the correct information to daemon for new index.js setup  
						
						
						
						
					 
					
						2017-03-12 16:04:47 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							419031e0cd 
							
						 
					 
					
						
						
							
							Add function file editing, and move all service file items into database  
						
						
						
						
					 
					
						2017-03-12 15:59:17 -04:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d585294289 
							
						 
					 
					
						
						
							
							Misc. file removal and migration cleanup  
						
						
						
						
					 
					
						2017-03-12 00:03:04 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d7682bb7c9 
							
						 
					 
					
						
						
							
							Complete new service, option, and variable management interface in Admin CP  
						
						
						
						
					 
					
						2017-03-12 00:00:06 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bccbb309b2 
							
						 
					 
					
						
						
							
							Fix broken descriptors  
						
						
						
						
					 
					
						2017-03-11 15:02:04 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							871b735464 
							
						 
					 
					
						
						
							
							Ignore VSCode files  
						
						
						
						
					 
					
						2017-03-11 14:44:18 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							70db461075 
							
						 
					 
					
						
						
							
							Start push of service changes.  
						
						... 
						
						
						
						Changes the way service files are stored and allows for much easier
updates in the future that won’t affect custom services.
Also stores more configurations in the database to make life easier for
everyone. 
						
						
					 
					
						2017-03-10 18:25:12 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							57a8888528 
							
						 
					 
					
						
						
							
							Merge pull request  #340  from MeltedLux/patch-1  
						
						... 
						
						
						
						fix typo on admin user view deletion notice 
						
						
					 
					
						2017-03-10 14:07:35 +01:00 
						 
				 
			
				
					
						
							
							
								MeltedLux 
							
						 
					 
					
						
						
						
						
							
						
						
							887c859f61 
							
						 
					 
					
						
						
							
							Sneaky typo fix  
						
						
						
						
					 
					
						2017-03-10 07:29:58 +00:00 
						 
				 
			
				
					
						
							
							
								Jakob 
							
						 
					 
					
						
						
						
						
							
						
						
							171f25b7c9 
							
						 
					 
					
						
						
							
							fix forums link in CONTRIBUTING.md  
						
						
						
						
					 
					
						2017-03-07 15:19:21 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							a5577f0afd 
							
						 
					 
					
						
						
							
							Merge pull request  #334  from Pterodactyl/feature/admin-retheme  
						
						... 
						
						
						
						This PR purposely leaves out services from the Admin CP as they will be re-implemented in another branch due to the sheer amount of code that needs to be adjusted and worked with. 
						
						
					 
					
						2017-03-05 20:29:04 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							5bf2e2686a 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #335 )  
						
						
						
						
					 
					
						2017-03-05 20:28:29 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3355554704 
							
						 
					 
					
						
						
							
							Fix frontend database password reset  
						
						
						
						
					 
					
						2017-03-05 16:46:44 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							32dec97e46 
							
						 
					 
					
						
						
							
							Improved database mechanics in admin CP for server view  
						
						
						
						
					 
					
						2017-03-05 16:37:40 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							16aaf531d6 
							
						 
					 
					
						
						
							
							switch user delete box to the style from nodes for consistency  
						
						
						
						
					 
					
						2017-03-05 17:25:28 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5c32a91200 
							
						 
					 
					
						
						
							
							JS code updates  
						
						
						
						
					 
					
						2017-03-05 00:04:26 -05: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 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							d51ae5ec23 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #332 )  
						
						
						
						
					 
					
						2017-03-04 19:28:23 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cbbd3704fe 
							
						 
					 
					
						
						
							
							Add a second check here *just* to make sure someone doesn't break this.  
						
						
						
						
					 
					
						2017-03-04 19:27:24 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd0a45a777 
							
						 
					 
					
						
						
							
							Fixes caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags.  
						
						
						
						
					 
					
						2017-03-04 19:24:46 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5d59d364f8 
							
						 
					 
					
						
						
							
							Fixes bug preventing proper updating of caches and models due to undefined Auth::user()  
						
						
						
						
					 
					
						2017-03-04 19:04:11 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e688468920 
							
						 
					 
					
						
						
							
							Push updated server views  
						
						
						
						
					 
					
						2017-03-04 19:03:49 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a14cb5687 
							
						 
					 
					
						
						
							
							Remove old views  
						
						
						
						
					 
					
						2017-03-03 23:40:33 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
						
						
							
						
						
							b1564389d8 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #331 )  
						
						
						
						
					 
					
						2017-03-03 23:38:21 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e6d3663b3b 
							
						 
					 
					
						
						
							
							Model and template cleanup  
						
						
						
						
					 
					
						2017-03-03 23:37:41 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d38f89a468 
							
						 
					 
					
						
						
							
							Cleanup node routes, cleanup remote token  
						
						
						
						
					 
					
						2017-03-03 23:14:25 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							287015669a 
							
						 
					 
					
						
						
							
							Deleting nodes is now located on index  
						
						
						
						
					 
					
						2017-03-03 23:14:25 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							61d8332e93 
							
						 
					 
					
						
						
							
							make new user and view user consistent  
						
						
						
						
					 
					
						2017-03-04 01:47:39 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							23dfcbd7bc 
							
						 
					 
					
						
						
							
							retheme admin create user page  
						
						
						
						
					 
					
						2017-03-04 01:45:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							d1811822f3 
							
						 
					 
					
						
						
							
							fix form on admin user view  
						
						
						
						
					 
					
						2017-03-04 01:44:52 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							ae980f9020 
							
						 
					 
					
						
						
							
							retheme admin user view  
						
						
						
						
					 
					
						2017-03-04 01:10:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							e331157f53 
							
						 
					 
					
						
						
							
							add users menu link to new admin layout  
						
						... 
						
						
						
						rename server list to servers
rename node list to nodes 
						
						
					 
					
						2017-03-04 00:20:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							6df573e50c 
							
						 
					 
					
						
						
							
							retheme admin users list  
						
						
						
						
					 
					
						2017-03-04 00:16:11 +01:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fd5b74c873 
							
						 
					 
					
						
						
							
							Use usernames for @schrej  
						
						
						
						
					 
					
						2017-03-03 17:53:35 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2854a55aa2 
							
						 
					 
					
						
						
							
							Fix server view to use owner username and named route locations  
						
						
						
						
					 
					
						2017-03-03 17:50:45 -05:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							b91e3d95f8 
							
						 
					 
					
						
						
							
							fix revealing module and jquery3 of 2fa-modal  
						
						
						
						
					 
					
						2017-03-03 23:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							2efd6865e3 
							
						 
					 
					
						
						
							
							fix rethemed settings title  
						
						
						
						
					 
					
						2017-03-03 23:36:11 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							500cf7fdb3 
							
						 
					 
					
						
						
							
							Merge pull request  #329  from Pterodactyl/feature/new-theme  
						
						... 
						
						
						
						Some more changes to the new theme 
						
						
					 
					
						2017-03-03 17:33:40 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b301b89459 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/admin-retheme  
						
						
						
						
					 
					
						2017-03-03 17:30:51 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							6c7fff1de0 
							
						 
					 
					
						
						
							
							fix rethemed settings breadcrumbs  
						
						
						
						
					 
					
						2017-03-03 23:23:45 +01:00 
						 
				 
			
				
					
						
							
							
								Jakob Schrettenbrunner 
							
						 
					 
					
						
						
						
						
							
						
						
							c5e7f414f6 
							
						 
					 
					
						
						
							
							retheme admin settings view  
						
						
						
						
					 
					
						2017-03-03 23:18:36 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							c021872a9c 
							
						 
					 
					
						
						
							
							Update database.php  
						
						
						
						
					 
					
						2017-03-02 12:17:52 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf9fd12ae 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #325 )  
						
						
						
						
					 
					
						2017-02-24 18:23:03 -05:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cb6b44d4f0 
							
						 
					 
					
						
						
							
							Completed new server page with new theme.  
						
						
						
						
					 
					
						2017-02-24 18:19:03 -05:00