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 |
|
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
|
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
|
ae16fd6d6a
|
change adress to address
|
2023-01-12 10:25:28 +01:00 |
|
Shift
|
2e1af401c1
|
Move resources/lang folder
|
2023-01-05 17:02:03 +00:00 |
|