Commit graph

731 commits

Author SHA1 Message Date
IceToast 5b95dd4d13 Merge branch 'billing_system' into feature/billing_cycles
# Conflicts:
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	app/Models/User.php
#	lang/cs.json
#	lang/en.json
#	themes/default/views/admin/products/create.blade.php
#	themes/default/views/admin/products/edit.blade.php
#	themes/default/views/admin/settings/tabs/system.blade.php
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
#	themes/default/views/servers/settings.blade.php
2023-05-08 11:03:10 +02:00
1day2die 3d8a1cf53f notify groups (check validation needed) 2023-05-07 22:36:50 +02:00
1day2die b07238cbed customizable ticket information 2023-05-07 21:57:13 +02:00
1day2die a32d42feab OOM Killer 2023-05-07 21:41:26 +02:00
Dennis 438a3374b0
Merge branch 'Ctrlpanel-gg:development' into development 2023-05-07 21:30:05 +02:00
IceToast bc56f713ad fix: 🐛 Call parent constructor on model 2023-05-07 21:24:26 +02:00
1day2die 8279f07156 new Permission "admin.servers.bypass_creation_enabled" 2023-05-07 19:49:05 +02:00
1day2die a2a5426252 fix cloning 2023-05-07 19:45:50 +02:00
1day2die 28afc71d7f remove "allowed" on referral. its now a permission 2023-05-07 19:05:50 +02:00
1day2die 5e46bbbe7e Cleanup Middleware, Fix locale 2023-05-07 18:43:28 +02:00
1day2die 0899df5945 OOM killer & Roles / Permissions API 2023-05-05 14:06:38 +02:00
1day2die d41d0a6e2d ticket notify permission 2023-05-05 12:29:28 +02:00
1day2die 44db7b4847 Update AppServiceProvider.php 2023-05-05 12:01:57 +02:00
1day2die f71b6153e6 add back the github branch 2023-05-05 12:00:10 +02:00
1day2die 7d974d3408 role powers 2023-05-05 11:17:40 +02:00
1day2die a573454810 full settings permissions 2023-05-05 10:59:15 +02:00
1day2die 03eef835f7 simple settings perms 2023-05-05 01:28:56 +02:00
1day2die 79432fce82 Permission on sidebar 2023-05-05 01:21:19 +02:00
1day2die 4c780deb02 All permissions except Settings 2023-05-05 01:11:55 +02:00
1day2die 804a800d4f full frontend perms showing roles 2023-05-03 16:16:50 +02:00
1day2die 5d288cd070 Update UserPayment.php 2023-05-03 16:05:55 +02:00
1day2die 04a4f2ab96 disable invoices by default 2023-05-03 15:44:22 +02:00
IceToast d51d5c66bf
Merge branch 'dev_no-encryption' into fix_extensionHelper_OS 2023-05-03 15:18:31 +02:00
IceToast 7754041532 fix: 🐛 hotfix migrations 2023-05-03 15:17:35 +02:00
IceToast a4280a6fba fix: 🐛 Path seperator replacement -> be filesystem aware 2023-05-03 15:17:13 +02:00
1day2die eb3afbfaab full user permissions 2023-05-03 09:53:41 +02:00
1day2die e8c8d1c68d Use IDs instead of Role Names 2023-04-30 12:21:01 +02:00
1day2die c9c991d164 allow editing name of member and admin. should be fine. we are using IDs 2023-04-30 12:17:02 +02:00
1day2die fd2e65f8b3 fix rolecontroller 2023-04-30 12:15:42 +02:00
1day2die 83d7590b60 fix installer, new users get role 2023-04-30 12:13:01 +02:00
1day2die 490bc64f41 basic roles 2023-04-30 02:34:11 +02:00
1day2die 0ffceb535d simple starting permissions. only admin 2023-04-30 02:22:59 +02:00
1day2die bfda91516a add recaptcha to tickets and preview to settings 2023-04-30 01:00:45 +02:00
1day2die bcf238d6b7 rename controlpanel -> ctrlpanel 2023-04-30 00:38:47 +02:00
1day2die 50d0e9a37d replace controlpanel.gg -> ctrlpanel.gg 2023-04-30 00:31:32 +02:00
1day2die 0bde32bd2f remove encryption to continue working // FIX INSTALLER [value] -> [payload] 2023-04-30 00:17:40 +02:00
Dennis 3810b487cd
Merge branch 'development' into main 2023-04-25 09:15:46 +02:00
1day2die 023772d929 Fix MacError on MakeUser 2023-04-20 23:07:01 +02:00
Jens b99d6a51a6
[FIX] Shouldn't forget caller 2023-04-14 10:09:28 +02:00
Jens 15ee059d30
[Fix] Fix new installations
This bugfix comments out the installation counter as it is currently an extremely bad practice and resulted in an issue with errors.
2023-04-14 10:01:05 +02:00
ok236449 821d85e395 fix server deletion upon changing product 2023-04-12 20:51:08 +02:00
IceToast 44948226bb
fix: 🐛 typo 2023-04-04 01:45:29 +02:00
IceToast 5b8f12fa94
fix: 🐛 Settings update -> type check 2023-04-04 01:45:18 +02:00
IceToast 18d4962ef9
fix: 🔒️ Do not allow last admin deletion #762 2023-04-04 01:27:05 +02:00
IceToast 307f3229d2
fix: 🐛 external_id already used #769 2023-04-04 01:23:44 +02:00
IceToast ce544019eb
refactor: 🚚 Rename pterodactyl application api accordingly 2023-04-04 01:16:39 +02:00
IceToast 1784358fc2
fix: 🐛 Potentional installation fix -> APP_KEY missing 2023-04-04 00:28:20 +02:00
IceToast 6497f6bf90 fix: 🔥 Removed default values from Settings class variables 2023-04-02 20:00:56 +02:00
Jens f7ab52fec1 (Refactor) Validation and variable modification to align with the input data 2023-04-02 20:00:56 +02:00
IceToast 5b44df24ab fix: 🐛 Mollie gateway route and settings 2023-03-30 14:07:07 +02:00