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 
						 
				 
			
				
					
						
							
							
								Charles 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8497e8b009 
							
						 
					 
					
						
						
							
							Update egg-bungeecord.json ( #571 )  
						
						
						
						
					 
					
						2024-09-07 12:45:25 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							8c64a4ad55 
							
						 
					 
					
						
						
							
							Make MySQL Happy  
						
						... 
						
						
						
						MySQL complains when we try to change the rules column to json before we change the data... If we change the data, then change the column its happy. :) 
						
						
					 
					
						2024-09-07 09:47:39 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							49e93c1379 
							
						 
					 
					
						
						
							
							Fix Migration  
						
						... 
						
						
						
						Fix rule migration reversal. 
						
						
					 
					
						2024-09-06 15:50:42 -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 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							155f2d6476 
							
						 
					 
					
						
						
							
							Add migration to fix allocations server_id foreign key ( #542 )  
						
						... 
						
						
						
						* add migration to fix allocations server_id foreign key
* fix the fix... 
						
						
					 
					
						2024-08-13 19:43:16 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							10806d6d6b 
							
						 
					 
					
						
						
							
							Fix SQLite foreign keys ( #478 )  
						
						... 
						
						
						
						* start migration to fix sqlite foreign keys
* add remaining foreign keys
* add ".sqlite.backup" files to gitignore 
						
						
					 
					
						2024-07-17 14:43:04 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							447e889a4f 
							
						 
					 
					
						
						
							
							Fix default timestamp for activity logs ( #468 )  
						
						... 
						
						
						
						* fix default timestamp for activity logs
* fix phpstan 
						
						
					 
					
						2024-07-10 08:36:24 +02:00 
						 
				 
			
				
					
						
							
							
								Charles 
							
						 
					 
					
						
						
						
						
							
						
						
							c115c6ddf5 
							
						 
					 
					
						
						
							
							Add Update URL to stock eggs  
						
						
						
						
					 
					
						2024-07-03 10:36:34 -04:00 
						 
				 
			
				
					
						
							
							
								Charles 
							
						 
					 
					
						
						
						
						
							
						
						
							11feef4f8c 
							
						 
					 
					
						
						
							
							Update Eggs  
						
						
						
						
					 
					
						2024-07-03 06:32:30 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c41e659b5 
							
						 
					 
					
						
						
							
							Add main server port and default  
						
						
						
						
					 
					
						2024-07-01 15:13:20 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							6238d6dd08 
							
						 
					 
					
						
						
							
							Switch to port rule  
						
						
						
						
					 
					
						2024-07-01 15:12:33 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6122f919a 
							
						 
					 
					
						
						
							
							Rename this because order matters  
						
						
						
						
					 
					
						2024-06-26 22:03:23 -04: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 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf37994c3b 
							
						 
					 
					
						
						
							
							Allow user to switch time zones ( #332 )  
						
						... 
						
						
						
						* Description not required
* Overwrite to use user’s time zone
* Allow users to change time zones
* Update app/Filament/Resources/UserResource/Pages/EditProfile.php
Co-authored-by: Boy132 <Boy132@users.noreply.github.com>
* Pint fix
---------
Co-authored-by: Charles <charles@pelican.dev>
Co-authored-by: Boy132 <Boy132@users.noreply.github.com> 
						
						
					 
					
						2024-06-25 20:17:08 -04:00 
						 
				 
			
				
					
						
							
							
								MartinOscar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d4eecdd53d 
							
						 
					 
					
						
						
							
							Update OAuth migration ( #409 )  
						
						
						
						
					 
					
						2024-06-17 07:03:36 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							ff261f9c99 
							
						 
					 
					
						
						
							
							Realism  
						
						
						
						
					 
					
						2024-06-16 13:07:12 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							f57232bc23 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2024-06-16 11:50:08 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							b24ff8bb26 
							
						 
					 
					
						
						
							
							Unwrap transaction  
						
						
						
						
					 
					
						2024-06-15 07:27:17 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff8e509ef 
							
						 
					 
					
						
						
							
							Wrap in transaction  
						
						
						
						
					 
					
						2024-06-15 07:19:01 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							6976fa8989 
							
						 
					 
					
						
						
							
							Try again  
						
						
						
						
					 
					
						2024-06-15 06:57:11 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b58160da9 
							
						 
					 
					
						
						
							
							Drop it  
						
						
						
						
					 
					
						2024-06-15 06:04:20 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a26f5ce9e 
							
						 
					 
					
						
						
							
							This goes first  
						
						
						
						
					 
					
						2024-06-15 05:34:56 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							b47f40bd13 
							
						 
					 
					
						
						
							
							Remove debug  
						
						
						
						
					 
					
						2024-06-15 05:24:57 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							0bd2935885 
							
						 
					 
					
						
						
							
							Merge branch 'main' into issue/68  
						
						... 
						
						
						
						# Conflicts:
#	app/Filament/Resources/EggResource/RelationManagers/ServersRelationManager.php
#	app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
#	app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php
#	app/Filament/Resources/ServerResource/Pages/CreateServer.php
#	app/Filament/Resources/ServerResource/Pages/ListServers.php
#	app/Filament/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php
#	app/Filament/Resources/UserResource/RelationManagers/ServersRelationManager.php
#	app/Models/Allocation.php
#	app/Models/ApiKey.php
#	app/Models/Server.php
#	app/Models/User.php 
						
						
					 
					
						2024-06-15 05:21:58 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a3c606627 
							
						 
					 
					
						
						
							
							Add OAuth backend ( #386 )  
						
						... 
						
						
						
						* add socialite backend
* fix redirect url
* small cleanup
* fix "oauth" type
* changes from review 
						
						
					 
					
						2024-06-13 21:06:31 +02:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							36e2fa8e2b 
							
						 
					 
					
						
						
							
							Wip  
						
						
						
						
					 
					
						2024-06-13 11:31:58 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0c0b468525 
							
						 
					 
					
						
						
							
							Change allowed_ips to non-nullable ( #373 )  
						
						... 
						
						
						
						* change `allowed_ips` to non nullable
* fix default value
* show "allowed_ips" input 
						
						
					 
					
						2024-06-13 08:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							61f3e965ba 
							
						 
					 
					
						
						
							
							Refactor egg services ( #358 )  
						
						... 
						
						
						
						* combine importer and updateimport
* integrate egg parser into importer
* remove EggCreationService and EggUpdateService
* run pint
* revert change to composer.json
* use egg exporter directly instead of old admin route 
						
						
					 
					
						2024-06-11 21:01:31 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							10796f8916 
							
						 
					 
					
						
						
							
							Dedicated MariaDB driver ( #365 )  
						
						... 
						
						
						
						* dedicated tests for mariadb
* fix migrations
* update database config
* update database setup command 
						
						
					 
					
						2024-06-11 21:01:14 +02:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							4319f24f51 
							
						 
					 
					
						
						
							
							Merge branch 'main' into issue/68  
						
						... 
						
						
						
						# Conflicts:
#	app/Filament/Resources/ServerResource/Pages/CreateServer.php
#	app/Models/Node.php 
						
						
					 
					
						2024-06-09 15:42:49 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							beadce96f6 
							
						 
					 
					
						
						
							
							Wip  
						
						
						
						
					 
					
						2024-06-09 08:20:31 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							c5824ff26c 
							
						 
					 
					
						
						
							
							Whoops.... Fix env replacement...  
						
						... 
						
						
						
						Somehow this got copy pasta'd and yeh.... its not right... 
						
						
					 
					
						2024-06-07 22:18:12 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0156456919 
							
						 
					 
					
						
						
							
							Merge branch 'pelican-dev:main' into feature/node-sftp-alias  
						
						
						
						
					 
					
						2024-06-07 23:49:38 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cc1ac1eba1 
							
						 
					 
					
						
						
							
							Allow importing eggs via url ( #344 )  
						
						... 
						
						
						
						* allow importing eggs via url
* refactor
* run pint
* turn back into one button
* fix empty check
* small cleanup
* removed container for tabs
* Update URL function
* Use sys temp
---------
Co-authored-by: notCharles <charles@pelican.dev> 
						
						
					 
					
						2024-06-07 17:31:34 -04:00 
						 
				 
			
				
					
						
							
							
								Charles 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							02d24b8a36 
							
						 
					 
					
						
						
							
							Fix the egg variable disaster... ( #331 )  
						
						... 
						
						
						
						* Migrations to update existing eggs in db
* Update stock eggs
* Update Eggs on import
* Also update updated versions of eggs that are uploaded
* Redo this..
Tests passed locally.
* Pint & Update replace
* Squash Migrations, simplify logic
* Maybe this way...
* Swap them over to single call
---------
Co-authored-by: Lance Pioch <git@lance.sh> 
						
						
					 
					
						2024-06-07 16:23:25 -04:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							32e96dc0a6 
							
						 
					 
					
						
						
							
							Wip  
						
						
						
						
					 
					
						2024-06-06 15:49:36 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f9fd426aca 
							
						 
					 
					
						
						
							
							change column type to string  
						
						... 
						
						
						
						Co-authored-by: Lance Pioch <lancepioch@gmail.com> 
						
						
					 
					
						2024-06-05 08:47:11 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2261f6cd 
							
						 
					 
					
						
						
							
							add alias for node sftp address  
						
						
						
						
					 
					
						2024-06-04 09:17:36 +02:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							53aa52f519 
							
						 
					 
					
						
						
							
							Add migration to update stock egg uuids  
						
						
						
						
					 
					
						2024-06-02 17:06:42 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							e884eda5a7 
							
						 
					 
					
						
						
							
							Update stock eggs to have UUIDs  
						
						
						
						
					 
					
						2024-06-02 16:50:55 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
						
						
							
						
						
							7cda358b66 
							
						 
					 
					
						
						
							
							add missing import  
						
						
						
						
					 
					
						2024-05-31 23:07:50 +02:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
						
						
							
						
						
							33f6551b21 
							
						 
					 
					
						
						
							
							run pint  
						
						
						
						
					 
					
						2024-05-31 23:06:46 +02:00 
						 
				 
			
				
					
						
							
							
								Lance Pioch 
							
						 
					 
					
						
						
						
						
							
						
						
							c956cd0106 
							
						 
					 
					
						
						
							
							Update old keys  
						
						
						
						
					 
					
						2024-05-31 17:03:14 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
						
						
							
						
						
							82fd547484 
							
						 
					 
					
						
						
							
							replace encrypt/ decrypt with encrypted casting  
						
						
						
						
					 
					
						2024-05-28 15:24:20 +02:00 
						 
				 
			
				
					
						
							
							
								Jordan Adams 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1e67cd9944 
							
						 
					 
					
						
						
							
							Fix mumble host to allow IPv6 ( #264 )  
						
						
						
						
					 
					
						2024-05-24 19:36:18 -04:00 
						 
				 
			
				
					
						
							
							
								Boy132 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4dd833562b 
							
						 
					 
					
						
						
							
							Add CPU limit to node ( #239 ) to  resolve   #233  
						
						... 
						
						
						
						* add node cpu limit to backend
* update makenodecommand
* add node cpu limit to frontend
* add migration and update mysql schema
* run pint
* fix typo in mysql schema
* forgot this assert
* forgot to setCpu here
* run pint
* adjust migration
* Fix db migration
* make cpu optional
* set default value for cpu in node deployment
* update mysql schema
---------
Co-authored-by: notCharles <charles@pelican.dev> 
						
						
					 
					
						2024-05-22 02:34:43 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							859a721e17 
							
						 
					 
					
						
						
							
							mysql vs sqlite...  
						
						
						
						
					 
					
						2024-05-19 21:30:25 -04:00 
						 
				 
			
				
					
						
							
							
								notCharles 
							
						 
					 
					
						
						
						
						
							
						
						
							4c43fd1683 
							
						 
					 
					
						
						
							
							Add docker_labels  
						
						
						
						
					 
					
						2024-05-19 20:55:37 -04:00