Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f5e9a6c30
							
						
					 | 
					
						
						
							
							Merge branch 'main' into issue/68
						
						
						
						
						
						
						
						# Conflicts:
#	app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
#	app/Filament/Resources/ServerResource/Pages/CreateServer.php
#	app/Filament/Resources/ServerResource/Pages/EditServer.php
#	app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php
#	app/Filament/Resources/UserResource/Pages/EditProfile.php
#	app/Models/Node.php
#	app/Models/Objects/DeploymentObject.php
#	app/Services/Allocations/AssignmentService.php
#	app/Services/Servers/ServerCreationService.php
#	app/Services/Servers/TransferServerService.php
#	pint.json 
						
						
					 | 
					
						2024-10-20 15:14:08 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							deb6603840
							
						
					 | 
					
						
						
							
							Revert "Add concat_space rule"
						
						
						
						
						
						
						
						This reverts commit 96acd268bee7005fe1691b572a4674575604d437. 
						
						
					 | 
					
						2024-10-19 21:14:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d21740d458
							
						
					 | 
					
						
						
							
							Add phpdoc_align rule
						
						
						
						
						
						
					 | 
					
						2024-10-19 18:42:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							96acd268be
							
						
					 | 
					
						
						
							
							Add concat_space rule
						
						
						
						
						
						
					 | 
					
						2024-10-19 18:30:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2f6842f64
							
						
					 | 
					
						
						
							
							Smarter check
						
						
						
						
						
						
					 | 
					
						2024-10-18 22:17:15 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a6b846230
							
						
					 | 
					
						
						
							
							Merge branch 'main' into issue/68
						
						
						
						
						
						
						
						# Conflicts:
#	app/Filament/Resources/ServerResource/Pages/CreateServer.php
#	app/Filament/Resources/ServerResource/Pages/EditServer.php
#	app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php
#	app/Services/Allocations/AssignmentService.php
#	database/Seeders/eggs/minecraft/egg-bungeecord.json
#	database/Seeders/eggs/minecraft/egg-forge-minecraft.json
#	database/Seeders/eggs/minecraft/egg-paper.json
#	database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json
#	database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
#	database/Seeders/eggs/rust/egg-rust.json
#	database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json
#	database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
#	database/Seeders/eggs/source-engine/egg-garrys-mod.json
#	database/Seeders/eggs/source-engine/egg-insurgency.json
#	database/Seeders/eggs/source-engine/egg-team-fortress2.json
#	database/Seeders/eggs/voice-servers/egg-mumble-server.json
#	database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json 
						
						
					 | 
					
						2024-09-18 22:21:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c2b1a98d29
							
						
					 | 
					
						
						
							
							Convert variable "rules" to array (#507)
						
						
						
						
						
						
						
						* convert variable "rules" to array
* allow importing eggs with string rules
* fix tests
* update stock eggs to rules array 
						
						
					 | 
					
						2024-08-19 08:33:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							45fcc2a09a
							
						
					 | 
					
						
						
							
							Merge branch 'main' into issue/68
						
						
						
						
						
						
						
						# Conflicts:
#	app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
#	app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
#	app/Filament/Resources/ServerResource/Pages/CreateServer.php
#	app/Filament/Resources/ServerResource/Pages/EditServer.php
#	app/Filament/Resources/ServerResource/Pages/ListServers.php
#	app/Http/Requests/Admin/Node/AllocationFormRequest.php
#	app/Http/Requests/Api/Application/Allocations/StoreAllocationRequest.php
#	app/Models/AuditLog.php
#	app/Models/Server.php 
						
						
					 | 
					
						2024-06-26 21:52:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MartinOscar
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aa08e774a1
							
						
					 | 
					
						
						
							
							Fix varchar(191) by replacing with 255 #135 (#376)
						
						
						
						
						
						
						
						* Add Nullable
* Edit filament & AppServiceProvider
* Pint
* Patch tests
* Actually patching tests
* Actually patching tests
* Remove length
* Remove defaultStringLength
* Let’s see the differences
---------
Co-authored-by: Lance Pioch <git@lance.sh> 
						
						
					 | 
					
						2024-06-16 13:56:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							36e2fa8e2b
							
						
					 | 
					
						
						
							
							Wip
						
						
						
						
						
						
					 | 
					
						2024-06-13 11:31:58 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b1928e89b4
							
						
					 | 
					
						
						
							
							Merge branch 'pelican-dev:main' into replace/encrypt-decrypt
						
						
						
						
						
						
					 | 
					
						2024-05-31 23:04:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b6e46f758d
							
						
					 | 
					
						
						
							
							Remove hashids (#282) and close #269
						
						
						
						
						
						
					 | 
					
						2024-05-29 18:41:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
						
						
							
						
						
							82fd547484
							
						
					 | 
					
						
						
							
							replace encrypt/ decrypt with encrypted casting
						
						
						
						
						
						
					 | 
					
						2024-05-28 15:24:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
						
						
							
						
						
							703e5480ff
							
						
					 | 
					
						
						
							
							add missing fields to StoreScheduleRequest
						
						
						
						
						
						
					 | 
					
						2024-05-13 18:55:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5008a43e7
							
						
					 | 
					
						
						
							
							Use new enum
						
						
						
						
						
						
					 | 
					
						2024-04-18 03:50:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							358ac96ac1
							
						
					 | 
					
						
						
							
							Swap http client out
						
						
						
						
						
						
					 | 
					
						2024-03-23 16:10:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7bc9f005f
							
						
					 | 
					
						
						
							
							Styling fixes
						
						
						
						
						
						
					 | 
					
						2024-03-23 08:10:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							49de8fae3e
							
						
					 | 
					
						
						
							
							Shouldn’t be testing controllers in this case…
						
						
						
						
						
						
					 | 
					
						2024-03-23 08:07:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							29b3debee2
							
						
					 | 
					
						
						
							
							Use Laravel’s same return types
						
						
						
						
						
						
					 | 
					
						2024-03-19 21:12:27 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5269e7e5c
							
						
					 | 
					
						
						
							
							Fix tests visibility
						
						
						
						
						
						
					 | 
					
						2024-03-19 21:09:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4d3ffc96c
							
						
					 | 
					
						
						
							
							Use faker methods instead of properties
						
						
						
						
						
						
					 | 
					
						2024-03-19 16:47:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7c2c1a84c
							
						
					 | 
					
						
						
							
							Formatting
						
						
						
						
						
						
					 | 
					
						2024-03-17 00:40:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4969aed383
							
						
					 | 
					
						
						
							
							Remove daemon command repo
						
						
						
						
						
						
					 | 
					
						2024-03-16 15:11:10 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lance Pioch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c83dd86a41
							
						
					 | 
					
						
						
							
							Switch namespace back to App
						
						
						
						
						
						
					 | 
					
						2024-03-12 22:39:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Penner
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1d38b4f0e2
							
						
					 | 
					
						
						
							
							Laravel 10 (#4706)
						
						
						
						
						
						
					 | 
					
						2023-02-23 12:30:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boy132
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f2095e815e
							
						
					 | 
					
						
						
							
							Allow users to change the server description (#4420)
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:20:53 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Penner
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cbcf62086f
							
						
					 | 
					
						
						
							
							Upgrade to Laravel 9 (#4413)
						
						
						
						
						
						
						
						Co-authored-by: DaneEveritt <dane@daneeveritt.com> 
						
						
					 | 
					
						2022-10-14 10:59:20 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c748fa9842
							
						
					 | 
					
						
						
							
							fix: exclude any permissions not defined internally when updating or creating subusers (#4416)
						
						
						
						
						
						
					 | 
					
						2022-10-09 16:14:16 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DaneEveritt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b052d29a5f
							
						
					 | 
					
						
						
							
							Fix failing integration test
						
						
						
						
						
						
					 | 
					
						2022-06-18 14:25:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DaneEveritt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0621d8475d
							
						
					 | 
					
						
						
							
							Return tests to passing now that we don't ignore a critical event...
						
						
						
						
						
						
					 | 
					
						2022-05-29 17:52:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DaneEveritt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							09832cc558
							
						
					 | 
					
						
						
							
							Ensure we can properly create an activity log entry; always return soft-deleted models
						
						
						
						
						
						
					 | 
					
						2022-05-29 17:07:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DaneEveritt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e88d24e0db
							
						
					 | 
					
						
						
							
							Don't allow allocations to be deleted by users if no limit is defined; closes #3703
						
						
						
						
						
						
					 | 
					
						2022-05-07 15:05:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							25d9ba4779
							
						
					 | 
					
						
						
							
							Run php-cs-fixer
						
						
						
						
						
						
					 | 
					
						2021-08-15 17:20:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							22f1341fea
							
						
					 | 
					
						
						
							
							reformat
						
						
						
						
						
						
					 | 
					
						2021-08-07 09:19:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							75e0a862e7
							
						
					 | 
					
						
						
							
							Add another sanity check for websocket permissions
						
						
						
						
						
						
					 | 
					
						2021-08-07 09:16:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d3e3b1db38
							
						
					 | 
					
						
						
							
							Test that a deleted backup makes an audit log entry
						
						
						
						
						
						
					 | 
					
						2021-07-11 12:15:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Morgan
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							76ac1998cf
							
						
					 | 
					
						
						
							
							Don't allow backups to be made via schedules if limit = 0 (#3323)
						
						
						
						
						
						
					 | 
					
						2021-05-16 09:47:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Julien Tant
							
						 
					 | 
					
						
						
						
						
							
						
						
							b10f6184e0
							
						
					 | 
					
						
						
							
							remove the test preventing disabled schedule to be manually executed
						
						
						
						
						
						
					 | 
					
						2021-04-24 18:30:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							be26921fcc
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into dane/restore-backups
						
						
						
						
						
						
					 | 
					
						2021-01-30 10:10:29 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5515871b2f
							
						
					 | 
					
						
						
							
							Turns out I hate that huge space formatting, disable that mess
						
						
						
						
						
						
					 | 
					
						2021-01-27 20:52:11 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							663143de0b
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into dane/restore-backups
						
						
						
						
						
						
					 | 
					
						2021-01-25 19:16:40 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c449ca5155
							
						
					 | 
					
						
						
							
							Use more standardized phpcs
						
						
						
						
						
						
					 | 
					
						2021-01-23 12:33:34 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a043071e3c
							
						
					 | 
					
						
						
							
							Update to Laravel 8
						
						
						
						
						
						
						
						Co-authored-by: Matthew Penner <me@matthewp.io> 
						
						
					 | 
					
						2021-01-23 12:12:54 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aab353d91e
							
						
					 | 
					
						
						
							
							Merge pull request #3011 from AreYouRlyScared/addcronmonth
						
						
						
						
						
						
						
						Adds months for schedules 
						
						
					 | 
					
						2021-01-20 20:10:26 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							63f945bc3a
							
						
					 | 
					
						
						
							
							Add test coverage to cehck the authorization state of client resources
						
						
						
						
						
						
					 | 
					
						2021-01-19 21:20:55 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a75a347d65
							
						
					 | 
					
						
						
							
							Remove suspended & installing fields, replace with single status field
						
						
						
						
						
						
					 | 
					
						2021-01-17 15:51:56 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Morgan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffeedf17e4
							
						
					 | 
					
						
						
							
							Adds months for schedules
						
						
						
						
						
						
						
						Adds month variable for schedules 
						
						
					 | 
					
						2021-01-16 22:07:39 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							45a3533f1e
							
						
					 | 
					
						
						
							
							Update WebsocketControllerTest.php
						
						
						
						
						
						
					 | 
					
						2020-12-24 10:23:04 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ef787bbd78
							
						
					 | 
					
						
						
							
							Update DeleteSubuserTest.php
						
						
						
						
						
						
					 | 
					
						2020-12-06 15:26:20 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f99ac0ecde
							
						
					 | 
					
						
						
							
							Fix some failing test cases
						
						
						
						
						
						
					 | 
					
						2020-11-06 22:33:39 -08:00 | 
					
					
						
						
							
							
							
						
					 |