Commit graph

11 commits

Author SHA1 Message Date
1day2die 9804149beb oom killer frontend 2023-05-08 12:07:23 +02:00
IceToast da338aacdc fix: 🐛 Old settings relict the second 2023-05-08 11:35:28 +02:00
IceToast ad5ff40761 fix: 🐛 Old settings relict 2023-05-08 11:26:47 +02:00
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 a32d42feab OOM Killer 2023-05-07 21:41:26 +02:00
1day2die eb3afbfaab full user permissions 2023-05-03 09:53:41 +02:00
Ferks-FK 9cd25034fc Another ton of modifications 2023-02-24 14:02:28 +01:00
IceToast 255671e20d
fix: 🐛 Merge issues 2023-02-06 14:45:44 +01:00
IceToast bd11bd2657
Revert "Merge branch 'v0.10' into development"
This reverts commit e6a545309f, reversing
changes made to 036fe6f47f.
2023-02-01 21:03:20 +01:00
IceToast 5fd58514b5 Merge branch addons/billing_period into V0.10 2023-01-21 15:13:48 +01:00
1day2die 9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00