Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4d52ba2b39
							
						
					 | 
					
						
						
							
							Merge branch 'feature/service-export-import' of https://github.com/Pterodactyl/Panel into feature/service-export-import
						
						
						
						
						
						
					 | 
					
						2017-10-07 23:29:23 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							787346525b
							
						
					 | 
					
						
						
							
							Update a batch of failing tests
						
						
						
						
						
						
					 | 
					
						2017-10-07 23:29:08 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b1ea3af0b
							
						
					 | 
					
						
						
							
							Merge pull request #672 from Pterodactyl/remove-caching-bs
						
						
						
						
						
						
						
						Make config caching less aggressive 
						
						
					 | 
					
						2017-10-07 22:05:22 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anand Capur
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b08d6a4b9d
							
						
					 | 
					
						
						
							
							Make config caching less aggressive
						
						
						
						
						
						
					 | 
					
						2017-10-07 20:00:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1a1fa081a
							
						
					 | 
					
						
						
							
							Apply fixes from StyleCI (#669)
						
						
						
						
						
						
					 | 
					
						2017-10-07 18:08:43 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c19c423568
							
						
					 | 
					
						
						
							
							More fixes
						
						
						
						
						
						
					 | 
					
						2017-10-07 18:08:19 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							17642bffe7
							
						
					 | 
					
						
						
							
							More code updates
						
						
						
						
						
						
					 | 
					
						2017-10-07 17:21:41 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cc297eea09
							
						
					 | 
					
						
						
							
							Misc changes
						
						
						
						
						
						
					 | 
					
						2017-10-07 16:19:07 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6b8464ea3a
							
						
					 | 
					
						
						
							
							Nest & Egg management working through the ACP now.
						
						
						
						
						
						
					 | 
					
						2017-10-07 16:16:51 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							df87ea0867
							
						
					 | 
					
						
						
							
							This breaks literally the entire panel.
						
						
						
						
						
						
					 | 
					
						2017-10-06 23:57:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TrixterTheTux
							
						 
					 | 
					
						
						
						
						
							
						
						
							acdc78e89d
							
						
					 | 
					
						
						
							
							Fix for #630 (#657)
						
						
						
						
						
						
					 | 
					
						2017-10-06 22:19:11 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							344c1a9885
							
						
					 | 
					
						
						
							
							First push before 🥚
						
						
						
						
						
						
					 | 
					
						2017-10-06 21:22:32 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0b3c0f6d5a
							
						
					 | 
					
						
						
							
							Ah yes, lets just spend 30 minutes trying to get a migration to run correctly.
						
						
						
						
						
						
					 | 
					
						2017-10-06 20:39:11 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							675e780946
							
						
					 | 
					
						
						
							
							Fix test failures
						
						
						
						
						
						
					 | 
					
						2017-10-06 00:16:22 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							38075c6b9f
							
						
					 | 
					
						
						
							
							Update panel to send correct service option configuration to the daemon.
						
						
						
						
						
						
					 | 
					
						2017-10-05 23:09:43 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1a5a1f82e7
							
						
					 | 
					
						
						
							
							Merge branch 'feature/service-export-import' of https://github.com/Pterodactyl/Panel into feature/service-export-import
						
						
						
						
						
						
					 | 
					
						2017-10-05 20:13:06 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							366221fa3f
							
						
					 | 
					
						
						
							
							;
						
						
						
						
						
						
					 | 
					
						2017-10-05 20:13:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8a5a082af
							
						
					 | 
					
						
						
							
							Merge pull request #661 from Pterodactyl/release/v0.6.4
						
						
						
						
						
						
						
						Update master, because I forgot it even exists... 
						
						
					 | 
					
						2017-10-05 00:21:50 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							29cfae86b1
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into feature/service-export-import
						
						
						
						
						
						
					 | 
					
						2017-10-05 00:17:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							b450e43f3b
							
						
					 | 
					
						
						
							
							Update CONTRIBUTING.md
						
						
						
						
						
						
					 | 
					
						2017-10-05 00:14:42 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							953f14b4e1
							
						
					 | 
					
						
						
							
							Update CONTRIBUTING.md
						
						
						
						
						
						
					 | 
					
						2017-10-05 00:14:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
						
						
							
						
						
							46aeca43d8
							
						
					 | 
					
						
						
							
							Update CONTRIBUTING.md
						
						
						
						
						
						
					 | 
					
						2017-10-05 00:13:10 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fbd5c25ed0
							
						
					 | 
					
						
						
							
							Finalize tests
						
						
						
						
						
						
					 | 
					
						2017-10-04 23:52:25 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							609bf32843
							
						
					 | 
					
						
						
							
							Add test for service option exporter
						
						
						
						
						
						
					 | 
					
						2017-10-04 23:42:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d95a63c09b
							
						
					 | 
					
						
						
							
							Today Dane learned about Mockery::subset, tomorrow we take over Canada.
						
						
						
						
						
						
						
						In other news, why could no one have mentioned this a few months ago. Would have been nice. 
						
						
					 | 
					
						2017-10-04 22:41:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kasper Franz
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7518d2a97
							
						
					 | 
					
						
						
							
							updated vagrant provision to be using the new namespace (#659)
						
						
						
						
						
						
						
						* updated to use the new commands 
						
						
					 | 
					
						2017-10-04 17:05:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3e689cf212
							
						
					 | 
					
						
						
							
							Please fix failing tests? ✋
						
						
						
						
						
						
					 | 
					
						2017-10-03 23:57:13 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							29ac1662b6
							
						
					 | 
					
						
						
							
							Fix failing tests
						
						
						
						
						
						
					 | 
					
						2017-10-03 23:54:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8952043600
							
						
					 | 
					
						
						
							
							Fix some test runner issues
						
						
						
						
						
						
					 | 
					
						2017-10-03 23:36:39 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9b79d9c756
							
						
					 | 
					
						
						
							
							Delete service variables when the option is deleted.
						
						
						
						
						
						
					 | 
					
						2017-10-03 23:33:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6269a08db7
							
						
					 | 
					
						
						
							
							Finalize service option import/export
						
						
						
						
						
						
					 | 
					
						2017-10-03 23:31:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d608c313c3
							
						
					 | 
					
						
						
							
							Complete the service option export configuration
						
						
						
						
						
						
					 | 
					
						2017-10-03 20:18:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TrixterTheTux
							
						 
					 | 
					
						
						
						
						
							
						
						
							6482f79088
							
						
					 | 
					
						
						
							
							Grant execute privilege (#655)
						
						
						
						
						
						
						
						closes #654 
						
						
					 | 
					
						2017-10-03 12:53:28 -10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0d739257a9
							
						
					 | 
					
						
						
							
							First pass at XML exporter for services
						
						
						
						
						
						
					 | 
					
						2017-10-03 00:01:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							12faf80faf
							
						
					 | 
					
						
						
							
							Disable seeding until more complete
						
						
						
						
						
						
					 | 
					
						2017-10-02 22:56:12 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ae671e6b19
							
						
					 | 
					
						
						
							
							Begin updating UI
						
						
						
						
						
						
					 | 
					
						2017-10-02 22:51:13 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							493c5888a3
							
						
					 | 
					
						
						
							
							Migration change
						
						
						
						
						
						
					 | 
					
						2017-10-02 22:03:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							220789a4b9
							
						
					 | 
					
						
						
							
							Push migrations to change existing service structure
						
						
						
						
						
						
					 | 
					
						2017-10-02 20:54:22 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							92ca84a37f
							
						
					 | 
					
						
						
							
							Remove unused controller
						
						
						
						
						
						
					 | 
					
						2017-10-02 20:03:47 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b1834307d5
							
						
					 | 
					
						
						
							
							Update demon routes to use /v1/
						
						
						
						
						
						
					 | 
					
						2017-09-30 21:00:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							15d38ce823
							
						
					 | 
					
						
						
							
							Add ability to switch between new and existing daemon
						
						
						
						
						
						
					 | 
					
						2017-09-30 19:23:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							281337943f
							
						
					 | 
					
						
						
							
							Fix SQL call
						
						
						
						
						
						
					 | 
					
						2017-09-30 19:04:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1216f950e2
							
						
					 | 
					
						
						
							
							Prevent deletion of options that have children attached to them.
						
						
						
						
						
						
						
						closes #562 
						
						
					 | 
					
						2017-09-30 12:54:09 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d5bf8734ef
							
						
					 | 
					
						
						
							
							Add unit tests for RunTaskJob.
						
						
						
						
						
						
					 | 
					
						2017-09-30 12:40:07 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							238ce435d6
							
						
					 | 
					
						
						
							
							interface_exists does not work how I expected, switch to is_subclass_of
						
						
						
						
						
						
					 | 
					
						2017-09-30 12:06:16 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							048784607d
							
						
					 | 
					
						
						
							
							Minor bug fixes
						
						
						
						
						
						
					 | 
					
						2017-09-30 11:45:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							28d838eccd
							
						
					 | 
					
						
						
							
							Fix subuser auth token again
						
						
						
						
						
						
					 | 
					
						2017-09-29 21:57:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0e0a8d4347
							
						
					 | 
					
						
						
							
							Fix 404 when trying to view a server
						
						
						
						
						
						
					 | 
					
						2017-09-29 21:54:00 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fb7ef2d775
							
						
					 | 
					
						
						
							
							test post please ignore
						
						
						
						
						
						
					 | 
					
						2017-09-26 22:54:34 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							65d63804ab
							
						
					 | 
					
						
						
							
							Pass in what the test says it passes in.
						
						
						
						
						
						
					 | 
					
						2017-09-26 22:23:19 -05:00 | 
					
					
						
						
							
							
							
						
					 |