Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14f9e1ad43 
							
						 
					 
					
						
						
							
							More permission removal cleanup  
						
						
						
						
					 
					
						2018-01-14 12:11:04 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d0bce4af97 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #875 )  
						
						... 
						
						
						
						[ci skip] [skip ci] 
						
						
					 
					
						2018-01-14 12:07:14 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad3a954256 
							
						 
					 
					
						
						
							
							Rename APIKey to ApiKey  
						
						
						
						
					 
					
						2018-01-14 12:06:15 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7aa540b895 
							
						 
					 
					
						
						
							
							Remove api permissions table  
						
						
						
						
					 
					
						2018-01-14 12:05:18 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b566630311 
							
						 
					 
					
						
						
							
							Merge branch 'feature/api-permissions' of  https://github.com/Pterodactyl/Panel  into feature/api-permissions  
						
						
						
						
					 
					
						2018-01-13 16:23:45 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0fb7fa30c 
							
						 
					 
					
						
						
							
							Fix failing ApiKeyCreationService test  
						
						
						
						
					 
					
						2018-01-13 16:23:43 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e8147cc43 
							
						 
					 
					
						
						
							
							Apply fixes from StyleCI ( #874 )  
						
						... 
						
						
						
						[ci skip] [skip ci] 
						
						
					 
					
						2018-01-13 16:06:55 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e3df0738da 
							
						 
					 
					
						
						
							
							Change the way API keys are stored and validated; clarify API namespacing  
						
						... 
						
						
						
						Previously, a single key was used to access the API, this has not changed in terms of what the user sees. However, API keys now use an identifier and token internally. The identifier is the first 16 characters of the key, and the token is the remaining 32. The token is stored encrypted at rest in the database and the identifier is used by the API middleware to grab that record and make a timing attack safe comparison. 
						
						
					 
					
						2018-01-13 16:06:19 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							11c4f3f6f2 
							
						 
					 
					
						
						
							
							Finish putting permissions on the API  
						
						
						
						
					 
					
						2018-01-13 14:08:19 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d644a53951 
							
						 
					 
					
						
						
							
							Update users & locations to use new permissions format  
						
						
						
						
					 
					
						2018-01-12 20:39:15 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a31e5875dc 
							
						 
					 
					
						
						
							
							First round of changes to API to support simpler permissions.  
						
						
						
						
					 
					
						2018-01-11 22:49:46 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e24c669c4 
							
						 
					 
					
						
						
							
							docblock  
						
						
						
						
					 
					
						2018-01-11 20:08:49 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf21fd5a4b 
							
						 
					 
					
						
						
							
							More API updates, better support for node config edits  
						
						
						
						
					 
					
						2018-01-10 23:19:03 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							800e2df6b2 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/api-v1  
						
						... 
						
						
						
						# Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php 
						
						
					 
					
						2018-01-10 20:55:22 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bd238c7555 
							
						 
					 
					
						
						
							
							No more OOME checkboxes  
						
						
						
						
					 
					
						2018-01-08 23:03:14 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							02e4c1424e 
							
						 
					 
					
						
						
							
							Select less data from servers  
						
						
						
						
					 
					
						2018-01-08 22:23:12 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0acc260b81 
							
						 
					 
					
						
						
							
							Change order that allocations are loaded in on the allocation listing  
						
						
						
						
					 
					
						2018-01-08 22:21:35 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22511c8e24 
							
						 
					 
					
						
						
							
							Fix allocation behavior,  closes   #712  
						
						
						
						
					 
					
						2018-01-08 22:12:19 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							036bea2b94 
							
						 
					 
					
						
						
							
							Update schedule process to allow toggling/triggering via UI  
						
						
						
						
					 
					
						2018-01-08 21:43:10 -06:00 
						 
				 
			
				
					
						
							
							
								Dimitar Yanakiev 
							
						 
					 
					
						
						
						
						
							
						
						
							02fe49892d 
							
						 
					 
					
						
						
							
							Fixed navigation account click ( #853 )  
						
						
						
						
					 
					
						2018-01-07 21:22:55 -06:00 
						 
				 
			
				
					
						
							
							
								Bl4ckSpr4y 
							
						 
					 
					
						
						
						
						
							
						
						
							d1806d9d29 
							
						 
					 
					
						
						
							
							Fix a typo ( #856 )  
						
						... 
						
						
						
						Changed 'custo' to 'custom'. 
						
						
					 
					
						2018-01-06 20:09:20 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a0a968c511 
							
						 
					 
					
						
						
							
							UI tweak for packs  
						
						
						
						
					 
					
						2018-01-06 15:25:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							94809b953c 
							
						 
					 
					
						
						
							
							Fix server setting bug  
						
						
						
						
					 
					
						2018-01-06 15:20:47 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a3bad520cd 
							
						 
					 
					
						
						
							
							closes   #807  
						
						
						
						
					 
					
						2018-01-06 13:19:17 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4b5ee920bd 
							
						 
					 
					
						
						
							
							Fix logic mistake with findOrFail  
						
						
						
						
					 
					
						2018-01-06 13:08:20 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							adcab5969a 
							
						 
					 
					
						
						
							
							Fix server description nullablility  
						
						
						
						
					 
					
						2018-01-06 12:58:30 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a75b15cd8d 
							
						 
					 
					
						
						
							
							closes   #852  
						
						
						
						
					 
					
						2018-01-06 12:53:17 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							59f8ae4b50 
							
						 
					 
					
						
						
							
							Too much grep  
						
						
						
						
					 
					
						2018-01-06 12:49:32 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							532ee98663 
							
						 
					 
					
						
						
							
							Merge branch 'feature/fix-repositories' into develop  
						
						
						
						
					 
					
						2018-01-06 12:46:05 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b3d7c6f1af 
							
						 
					 
					
						
						
							
							Fix search weighting for servers  
						
						
						
						
					 
					
						2018-01-05 18:49:00 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							21a78f465b 
							
						 
					 
					
						
						
							
							Fix node return being too strict  
						
						
						
						
					 
					
						2018-01-05 18:44:20 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d2afc29a80 
							
						 
					 
					
						
						
							
							Refactor how repositories for the daemon work.  
						
						
						
						
					 
					
						2018-01-05 18:27:47 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f9fe4a69b 
							
						 
					 
					
						
						
							
							Update calls to missing function  
						
						
						
						
					 
					
						2018-01-05 16:33:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fb74fbc715 
							
						 
					 
					
						
						
							
							Merge pull request  #850  from dyanakiev/patch-1  
						
						... 
						
						
						
						Add env db prefix in database.php 
						
						
					 
					
						2018-01-05 12:55:13 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60eb60013c 
							
						 
					 
					
						
						
							
							Update repository base code to be cleaner and make use of PHP 7 features  
						
						
						
						
					 
					
						2018-01-04 22:49:50 -06:00 
						 
				 
			
				
					
						
							
							
								Dimitar Yanakiev 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8690b5a154 
							
						 
					 
					
						
						
							
							Update database.php  
						
						
						
						
					 
					
						2018-01-05 01:06:01 +02:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f32cee3ae5 
							
						 
					 
					
						
						
							
							Add location control through API  
						
						
						
						
					 
					
						2018-01-03 21:14:53 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							15289b76a7 
							
						 
					 
					
						
						
							
							Finish first round of User/Node API additions  
						
						... 
						
						
						
						Will still need some tweaking and improvements to allow everything to be used. 
						
						
					 
					
						2018-01-01 15:11:44 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d21f70c04b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/api-v1  
						
						
						
						
					 
					
						2018-01-01 13:33:06 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0ec5a4e08c 
							
						 
					 
					
						
						
							
							Fix some file management bugs,  closes   #621  
						
						
						
						
					 
					
						2018-01-01 13:21:10 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ffc8d4875f 
							
						 
					 
					
						
						
							
							Fix unability to store '-1' in the database properly  
						
						
						
						
					 
					
						2018-01-01 12:32:33 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							958c29cfbf 
							
						 
					 
					
						
						
							
							Fix empty server descriptions throwing SQL errors,  closes   #842  
						
						
						
						
					 
					
						2018-01-01 12:23:45 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4457634127 
							
						 
					 
					
						
						
							
							Fix user creation to use UUIDs correctly  
						
						... 
						
						
						
						Also updates the notification send method to be cleaner and more maintainable 
						
						
					 
					
						2018-01-01 12:13:08 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							410a0cca9a 
							
						 
					 
					
						
						
							
							Fix 'Copy Script From' setting  
						
						
						
						
					 
					
						2017-12-31 13:17:06 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c3a69fce75 
							
						 
					 
					
						
						
							
							Show nest/egg IDs in listing,  closes   #687  
						
						
						
						
					 
					
						2017-12-31 13:14:30 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bcbf4614ea 
							
						 
					 
					
						
						
							
							Bump dependencies  
						
						
						
						
					 
					
						2017-12-31 11:48:03 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8a38a8af4a 
							
						 
					 
					
						
						
							
							Update file manager to account for new API error responses  
						
						
						
						
					 
					
						2017-12-31 10:39:07 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							46d7ba7585 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature/api-v1  
						
						
						
						
					 
					
						2017-12-31 10:32:28 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b2d7b6488 
							
						 
					 
					
						
						
							
							If folder does not exist, reload the file manager index  
						
						
						
						
					 
					
						2017-12-31 10:30:19 -06:00 
						 
				 
			
				
					
						
							
							
								Dane Everitt 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8ce0863559 
							
						 
					 
					
						
						
							
							Fix settings service provider to actually work when no migrations have been run.  
						
						
						
						
					 
					
						2017-12-30 20:53:34 -06:00