Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							77dfd9815f
							
						
					 | 
					
						
						
							
							moved compose to example
						
						
						
						
						
						
						
						moved the docker-compose script to an example and ignore docker-compose.yml 
						
						
					 | 
					
						2018-08-14 00:14:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4c54c4e47
							
						
					 | 
					
						
						
							
							updated docker-compose
						
						
						
						
						
						
						
						updated docker-compose 
						
						
					 | 
					
						2018-08-14 00:12:04 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ceef2edf2e
							
						
					 | 
					
						
						
							
							Add error handling for file manager
						
						
						
						
						
						
					 | 
					
						2018-08-13 21:06:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							47c100de2f
							
						
					 | 
					
						
						
							
							latest changes
						
						
						
						
						
						
					 | 
					
						2018-08-14 00:01:25 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							87e125ddad
							
						
					 | 
					
						
						
							
							key:generate is f'd
						
						
						
						
						
						
					 | 
					
						2018-08-13 23:33:15 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mrkrabs
							
						 
					 | 
					
						
						
						
						
							
						
						
							24b213fbc6
							
						
					 | 
					
						
						
							
							change smtp.google.com to smtp.gmail.com (#1281)
						
						
						
						
						
						
					 | 
					
						2018-08-13 10:00:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							92a9146b61
							
						
					 | 
					
						
						
							
							Improve filemanager, get first level folders listing
						
						
						
						
						
						
					 | 
					
						2018-08-06 23:14:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							00a3d7df87
							
						
					 | 
					
						
						
							
							Properly handle the console when the socket disconnects/reconnects
						
						
						
						
						
						
					 | 
					
						2018-08-06 22:21:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f20d40460e
							
						
					 | 
					
						
						
							
							Better handling of connection errors
						
						
						
						
						
						
					 | 
					
						2018-08-06 21:33:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								月光兔-lunarbunnys
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8373ec726
							
						
					 | 
					
						
						
							
							Add Simplified Chinese translation for the panel (#1263)
						
						
						
						
						
						
						
						* Add Simplified Chinese translation for the panel
* Update passwords.php
* The pterodactyl theme incomplete translation.Part 1.
* Deleteing pterodactyl theme translation. 
						
						
					 | 
					
						2018-08-06 17:15:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							63b76c60fb
							
						
					 | 
					
						
						
							
							dockerfile changes
						
						
						
						
						
						
					 | 
					
						2018-08-04 19:21:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f1ec968f38
							
						
					 | 
					
						
						
							
							Add beginning of the file manager
						
						
						
						
						
						
					 | 
					
						2018-08-03 22:32:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ce77ab21b3
							
						
					 | 
					
						
						
							
							Rearrange
						
						
						
						
						
						
					 | 
					
						2018-08-03 21:32:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7e6902cc90
							
						
					 | 
					
						
						
							
							Adjustments to the UI
						
						
						
						
						
						
					 | 
					
						2018-08-03 21:30:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c772376aa7
							
						
					 | 
					
						
						
							
							Add the expected buttons, reset color on each line
						
						
						
						
						
						
					 | 
					
						2018-08-03 20:48:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob
							
						 
					 | 
					
						
						
						
						
							
						
						
							962416445e
							
						
					 | 
					
						
						
							
							update shields (#1265)
						
						
						
						
						
						
					 | 
					
						2018-08-03 09:05:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c357e9231
							
						
					 | 
					
						
						
							
							add color scheme to termx on ConsolePage
						
						
						
						
						
						
					 | 
					
						2018-08-02 21:56:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							38d7985e66
							
						
					 | 
					
						
						
							
							More socket and console improvements for server
						
						
						
						
						
						
					 | 
					
						2018-08-01 23:37:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f866ad5b34
							
						
					 | 
					
						
						
							
							Fix spinners, change socket emit names
						
						
						
						
						
						
					 | 
					
						2018-08-01 21:10:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d9d4da5da
							
						
					 | 
					
						
						
							
							Use appropiate infinity signs (#1260)
						
						
						
						
						
						
					 | 
					
						2018-08-01 09:03:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5ca6538965
							
						
					 | 
					
						
						
							
							Autofocus search box when navigating to dashboard
						
						
						
						
						
						
					 | 
					
						2018-07-21 22:43:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							034e759298
							
						
					 | 
					
						
						
							
							Show a spinner on the console when loading the contents initially
						
						
						
						
						
						
					 | 
					
						2018-07-21 22:37:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							71d2a648ca
							
						
					 | 
					
						
						
							
							Fix spinner component to allow it to be positioned correctly
						
						
						
						
						
						
					 | 
					
						2018-07-21 22:31:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b9368eca45
							
						
					 | 
					
						
						
							
							Reset history to end when command is sent
						
						
						
						
						
						
					 | 
					
						2018-07-21 16:23:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3a97a89d20
							
						
					 | 
					
						
						
							
							Add command history
						
						
						
						
						
						
					 | 
					
						2018-07-21 16:22:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							38d50c8fc2
							
						
					 | 
					
						
						
							
							Hide the cursor entirely
						
						
						
						
						
						
					 | 
					
						2018-07-21 15:26:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a94c6d80f5
							
						
					 | 
					
						
						
							
							Add xterm for console support (holy shit this is speedy)
						
						
						
						
						
						
					 | 
					
						2018-07-21 15:20:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViViV_
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac71a56fd1
							
						
					 | 
					
						
						
							
							Adding variable for Server Map Selection [ARK SERVER] (#1230)
						
						
						
						
						
						
					 | 
					
						2018-07-21 10:40:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c2ebf1cbcd
							
						
					 | 
					
						
						
							
							Neaten up the console a bit more
						
						
						
						
						
						
					 | 
					
						2018-07-21 00:04:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2744280362
							
						
					 | 
					
						
						
							
							Styling tweaks
						
						
						
						
						
						
					 | 
					
						2018-07-20 23:49:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8db9d9bbee
							
						
					 | 
					
						
						
							
							Very rough go at connecting to socket and rendering console data for server
						
						
						
						
						
						
					 | 
					
						2018-07-20 23:45:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							784c73becd
							
						
					 | 
					
						
						
							
							Break console page into a component
						
						
						
						
						
						
					 | 
					
						2018-07-20 22:34:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2ab66ba8c8
							
						
					 | 
					
						
						
							
							Add logic to load server data into vuex for the request when visiting a server page
						
						
						
						
						
						
					 | 
					
						2018-07-18 22:48:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ac13c82fa
							
						
					 | 
					
						
						
							
							more docker changes
						
						
						
						
						
						
					 | 
					
						2018-07-18 17:15:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7da8532ba
							
						
					 | 
					
						
						
							
							Fixing install
						
						
						
						
						
						
						
						Adding php fpm conf and fixing dockerfile 
						
						
					 | 
					
						2018-07-18 15:31:35 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6dfaba9042
							
						
					 | 
					
						
						
							
							Merge pull request #1238 from jcsnider/develop
						
						
						
						
						
						
						
						Treat white space in terminal output as preformatted... 
						
						
					 | 
					
						2018-07-18 09:26:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael (Parker) Parker
							
						 
					 | 
					
						
						
						
						
							
						
						
							5427b7e172
							
						
					 | 
					
						
						
							
							dockerfile changes
						
						
						
						
						
						
					 | 
					
						2018-07-18 12:15:33 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JC Snider
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							955617d7ce
							
						
					 | 
					
						
						
							
							Update terminal.css
						
						
						
						
						
						
						
						Treat white space in terminal output as preformatted so ascii art/other formatting works. 
						
						
					 | 
					
						2018-07-17 18:09:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a42280dd84
							
						
					 | 
					
						
						
							
							Begin working on sidebar styling for server view
						
						
						
						
						
						
					 | 
					
						2018-07-15 19:47:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							92905a6c2a
							
						
					 | 
					
						
						
							
							Add the server routes
						
						
						
						
						
						
					 | 
					
						2018-07-15 19:03:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							79ea4cbe1a
							
						
					 | 
					
						
						
							
							Correct N+1 utilization checking
						
						
						
						
						
						
					 | 
					
						2018-07-15 18:11:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7f5485d648
							
						
					 | 
					
						
						
							
							Fix dashboard to track server state
						
						
						
						
						
						
					 | 
					
						2018-07-15 17:53:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8b3713e3ff
							
						
					 | 
					
						
						
							
							FOrmat and disable server store temporarily
						
						
						
						
						
						
					 | 
					
						2018-07-15 17:09:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d0348a4505
							
						
					 | 
					
						
						
							
							Fix 2FA on login
						
						
						
						
						
						
					 | 
					
						2018-07-15 17:09:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4c4f6d3afe
							
						
					 | 
					
						
						
							
							Fix login
						
						
						
						
						
						
					 | 
					
						2018-07-15 16:57:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ca27346e49
							
						
					 | 
					
						
						
							
							Remove empty css
						
						
						
						
						
						
					 | 
					
						2018-07-15 16:51:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f2d2725ca0
							
						
					 | 
					
						
						
							
							Merge branch 'feature/vuejs' into feature/vue-serverview
						
						
						
						
						
						
					 | 
					
						2018-07-15 16:50:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b859ed61f4
							
						
					 | 
					
						
						
							
							Performance improvements to browser tests
						
						
						
						
						
						
					 | 
					
						2018-07-15 16:20:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d9a09e92bd
							
						
					 | 
					
						
						
							
							Add tests for all of the account actions
						
						
						
						
						
						
					 | 
					
						2018-07-15 15:58:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							be2c76c24a
							
						
					 | 
					
						
						
							
							Add tests for password changing
						
						
						
						
						
						
					 | 
					
						2018-07-15 11:44:18 -07:00 | 
					
					
						
						
							
							
							
						
					 |