Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e688468920
							
						
					 | 
					
						
						
							
							Push updated server views
						
						
						
						
						
						
					 | 
					
						2017-03-04 19:03:49 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							58999913ba
							
						
					 | 
					
						
						
							
							More improvements to add server page.
						
						
						
						
						
						
					 | 
					
						2017-02-23 22:52:05 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8f96b35db1
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into feature/admin-retheme
						
						
						
						
						
						
					 | 
					
						2017-02-23 21:24:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							b11029a666
							
						
					 | 
					
						
						
							
							Apply fixes from StyleCI (#312)
						
						
						
						
						
						
						
						* Bump for release
* Apply fixes from StyleCI 
						
						
					 | 
					
						2017-02-18 22:57:50 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ed4068bdb9
							
						
					 | 
					
						
						
							
							Fix bug preventing server container rebuilds.
						
						
						
						
						
						
					 | 
					
						2017-02-18 22:33:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							644c07ea3a
							
						
					 | 
					
						
						
							
							Fix broken port deletion
						
						
						
						
						
						
					 | 
					
						2017-02-18 22:32:16 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b926d432e8
							
						
					 | 
					
						
						
							
							Thats enough re-theming for the day...
						
						
						
						
						
						
					 | 
					
						2017-02-18 19:31:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							99497adcb2
							
						
					 | 
					
						
						
							
							Show proper server status when viewing listing.
						
						
						
						
						
						
						
						closes #308 
						
						
					 | 
					
						2017-02-17 20:34:57 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e9762b4277
							
						
					 | 
					
						
						
							
							Fixes port deletion for node allocations as well as server notes on allocations.
						
						
						
						
						
						
						
						closes #305 
						
						
					 | 
					
						2017-02-17 19:59:40 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9af06b4b59
							
						
					 | 
					
						
						
							
							Add in query caching on server view
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:19:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							73996d3154
							
						
					 | 
					
						
						
							
							Fix bug in node update
						
						
						
						
						
						
					 | 
					
						2017-02-16 15:57:02 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							59f9ab6e90
							
						
					 | 
					
						
						
							
							Help @schrej not have an aneurysm.
						
						
						
						
						
						
					 | 
					
						2017-02-16 15:49:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5e63ac0baa
							
						
					 | 
					
						
						
							
							Fix double encoding of JSON
						
						
						
						
						
						
					 | 
					
						2017-02-16 15:38:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4e66ba078d
							
						
					 | 
					
						
						
							
							Fix locations error on create
						
						
						
						
						
						
					 | 
					
						2017-02-16 14:56:28 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob
							
						 
					 | 
					
						
						
						
						
							
						
						
							d230ee179a
							
						
					 | 
					
						
						
							
							Merge pull request #299 from Pterodactyl/feature/allow-login-with-username
						
						
						
						
						
						
						
						allow to use the username for login as well 
						
						
					 | 
					
						2017-02-16 20:47:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fc832838b
							
						
					 | 
					
						
						
							
							use ‚required|string‘ to validate usernames
						
						
						
						
						
						
					 | 
					
						2017-02-16 20:45:36 +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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c8ae776ab8
							
						
					 | 
					
						
						
							
							Fix settings redirection for server
						
						
						
						
						
						
					 | 
					
						2017-02-16 14:04:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2e134b7a55
							
						
					 | 
					
						
						
							
							Set out some roach traps to catch all these 🐛
						
						
						
						
						
						
					 | 
					
						2017-02-16 13:56:28 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c916ad38f
							
						
					 | 
					
						
						
							
							Apply fixes from StyleCI (#294)
						
						
						
						
						
						
					 | 
					
						2017-02-12 15:10:39 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							32a1dc17ed
							
						
					 | 
					
						
						
							
							API model updates, as well as general model updates and code fixes.
						
						
						
						
						
						
					 | 
					
						2017-02-10 20:26:38 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c70d31c08f
							
						
					 | 
					
						
						
							
							More model updates.
						
						
						
						
						
						
					 | 
					
						2017-02-10 17:36:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3b3002b77a
							
						
					 | 
					
						
						
							
							API Model updates.
						
						
						
						
						
						
					 | 
					
						2017-02-10 17:29:10 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							efef356870
							
						
					 | 
					
						
						
							
							Assorted model code updates.
						
						
						
						
						
						
					 | 
					
						2017-02-10 17:18:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ba175e6b55
							
						
					 | 
					
						
						
							
							Cleanup location model and controller for Admin.
						
						
						
						
						
						
					 | 
					
						2017-02-10 17:09:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0720bfe62f
							
						
					 | 
					
						
						
							
							Cleanup database query code.
						
						
						
						
						
						
					 | 
					
						2017-02-10 17:03:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							99812b0407
							
						
					 | 
					
						
						
							
							More subuser Model updates.
						
						
						
						
						
						
					 | 
					
						2017-02-09 19:38:54 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4f61637284
							
						
					 | 
					
						
						
							
							More model updates to more places than I anticipated.
						
						
						
						
						
						
						
						This probably broke a lot of things. 
						
						
					 | 
					
						2017-02-09 17:43:54 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							02458c909d
							
						
					 | 
					
						
						
							
							Improves server model and cleans up model code calls.
						
						
						
						
						
						
					 | 
					
						2017-02-05 19:19:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							323f1d943f
							
						
					 | 
					
						
						
							
							Completed model updates for Services
						
						
						
						
						
						
					 | 
					
						2017-02-05 17:58:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							09d23deed6
							
						
					 | 
					
						
						
							
							New models for node and location admin pages.
						
						
						
						
						
						
					 | 
					
						2017-02-03 16:50:28 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							96d3aa767f
							
						
					 | 
					
						
						
							
							Model updates for Database Management in ACP
						
						
						
						
						
						
					 | 
					
						2017-02-03 15:19:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9c2d34d6e6
							
						
					 | 
					
						
						
							
							Mo' StyleCI fixes... 🦀
						
						
						
						
						
						
					 | 
					
						2017-02-02 19:48:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							533e2bcafb
							
						
					 | 
					
						
						
							
							Fix database column references in ACP
						
						
						
						
						
						
					 | 
					
						2017-02-02 19:46:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3baa21a6eb
							
						
					 | 
					
						
						
							
							StyleCI fixes.
						
						
						
						
						
						
					 | 
					
						2017-02-02 19:43:55 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3114b7e52a
							
						
					 | 
					
						
						
							
							Complete implementation of new Server model.
						
						
						
						
						
						
					 | 
					
						2017-02-02 19:41:38 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d4bcf0be59
							
						
					 | 
					
						
						
							
							Initial implementation of improved sever model and logic
						
						
						
						
						
						
					 | 
					
						2017-02-02 18:21:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7f51e5df62
							
						
					 | 
					
						
						
							
							API tweaks to return more relevant information on server listing
						
						
						
						
						
						
					 | 
					
						2017-02-02 16:24:08 -05:00 | 
					
					
						
						
							
							
							
						
					 |