Commit graph

18 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 50d0e9a37d replace controlpanel.gg -> ctrlpanel.gg 2023-04-30 00:31:32 +02:00
ok236449 821d85e395 fix server deletion upon changing product 2023-04-12 20:51:08 +02:00
IceToast ae787dfc4c
chore: 🌐 localization 2023-02-06 14:36:00 +01:00
IceToast e254b2acfe
feat: Added Quartely billing period 2023-02-06 14:21:16 +01:00
IceToast 8565faa40b
chore: 🌐 Added Bold text for No refund 2023-02-06 14:21:16 +01:00
IceToast 54e14d5f2b
fix: 🐛 Fiy suspended typo & localization 2023-02-06 14:20:56 +01:00
IceToast 2c4b3ea03e
chore: 🌐 Localization 2023-02-06 14:20:55 +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 1da57a9478 update language file 2023-01-20 10:14:40 +01:00
GeckoBoy84 c4b12f95e9
Fix language file for partner values 2023-01-17 16:11:28 +00:00
GeckoBoy84 ca3b6cbb63 Capitalise Imprint inline with TOS and Privacy Policy Capitalisation 2023-01-16 21:58:10 +00:00
GeckoBoy84 6e6102d125 Show minimum required credits 2023-01-16 20:46:07 +00:00
1day2die ae16fd6d6a change adress to address 2023-01-12 10:25:28 +01:00
1day2die bdc99bd887 change "adress" to "address" 2023-01-12 10:25:14 +01:00
Shift 7ee787951b
Shift core files 2023-01-05 17:02:33 +00:00
Shift 2e1af401c1
Move resources/lang folder 2023-01-05 17:02:03 +00:00