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
..
ActivityLogController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
ApplicationApiController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
InvoiceController.php	Too many changes to mention.	2023-02-24 14:02:28 +01:00
LegalController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
OverViewController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
PartnerController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
PaymentController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
ProductController.php	Merge branch 'billing_system' into feature/billing_cycles	2023-05-08 11:03:10 +02:00
RoleController.php	role powers	2023-05-05 11:17:40 +02:00
ServerController.php	Merge branch 'billing_system' into feature/billing_cycles	2023-05-08 11:03:10 +02:00
SettingsController.php	Cleanup Middleware, Fix locale	2023-05-07 18:43:28 +02:00
ShopProductController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
TicketCategoryController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
TicketsController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
UsefulLinkController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00
UserController.php	notify groups (check validation needed)	2023-05-07 22:36:50 +02:00
VoucherController.php	All permissions except Settings	2023-05-05 01:11:55 +02:00