Commit graph

25 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 0899df5945 OOM killer & Roles / Permissions API 2023-05-05 14:06:38 +02:00
1day2die eb3afbfaab full user permissions 2023-05-03 09:53:41 +02:00
1day2die 0ffceb535d simple starting permissions. only admin 2023-04-30 02:22:59 +02:00
Ferks-FK fc49c6490f More Variables.. 2023-02-24 14:02:28 +01:00
Ferks-FK 9cd25034fc Another ton of modifications 2023-02-24 14:02:28 +01:00
IceToast d6341d41c9
Merge branch 'billing_system' of github.com:IceToast/cpgg_monthly_billing_addon into billing_system 2023-02-06 14:47:32 +01:00
IceToast 255671e20d
fix: 🐛 Merge issues 2023-02-06 14:45:44 +01:00
IceToast fda40fe8bc
fix: 🐛 Merge missing hidden product in form 2023-02-06 14:38:02 +01:00
IceToast 94cbea528c
Fixed Upgrade/Downgrade Credit withdrawal 2023-02-06 14:35:35 +01:00
IceToast 87ec49008d
fix: 🚑️ Fixed credits check at server creation & formatted prices nicely 2023-02-06 14:29:55 +01:00
IceToast f9d5238ea2
feat: Added billing period to server creation 2023-02-06 14:15:28 +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 25db97d0a4 fix: 🐛 Merge missing hidden product in form 2023-01-23 16:27:32 +01:00
IceToast da19554a46 Update Billing-System to V0.9
# Conflicts:
#	app/Console/Kernel.php
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/Admin/ServerController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	composer.lock
#	database/seeders/Seeds/ProductSeeder.php
#	lang/bg.json
#	lang/bs.json
#	lang/cs.json
#	lang/de.json
#	lang/en.json
#	lang/es.json
#	lang/he.json
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
2023-01-23 16:19:32 +01:00
IceToast 5fd58514b5 Merge branch addons/billing_period into V0.10 2023-01-21 15:13:48 +01:00
IceToast 1a75d63ba1 refactor: cleaner code closes #605 2023-01-18 23:54:37 +01:00
IceToast 3b2a851f4f fix: 🚑️ Create multiple servers when clicking submit multiple times 2023-01-18 23:50:52 +01:00
GeckoBoy84 d42c25bf56 -1 shows the actual value 2023-01-16 21:34:37 +00:00
GeckoBoy84 6e6102d125 Show minimum required credits 2023-01-16 20:46:07 +00:00
1day2die 9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00