Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/app/Http/Controllers/ContactController.php		2020-06-29 14:48:53 +02:00
..
CalendarController.php	Calendar stuff.	2020-06-24 08:54:56 +02:00
CalendarDateController.php	Working on controllers	2020-06-18 08:01:42 +02:00
ContactController.php	worked on event blade files.	2020-06-29 14:48:31 +02:00
Controller.php	Initial Commit	2020-06-08 10:04:45 +02:00
EventController.php	worked on event blade files.	2020-06-29 14:48:31 +02:00
ExternalLinkController.php	updated Externallink. Should be able to do crud	2020-06-29 09:19:43 +02:00
FeedbackController.php	Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php	2020-06-29 12:56:08 +02:00
MenuPlanController.php	DO NOT TOUCH MENUPLAN-STUFF!!!	2020-06-29 09:08:49 +02:00
PermissionController.php	Updated Controllers	2020-06-25 12:40:26 +02:00
ResourceCategoryController.php	Fixed Controller dependencies.	2020-06-24 08:23:15 +02:00
ResourceController.php	Fixed Controller dependencies.	2020-06-24 08:23:15 +02:00
ResourceExtensionController.php	Fixed Controller dependencies.	2020-06-24 08:23:15 +02:00
RootController.php	Fixed "Le Fix" Error 0x01	2020-06-24 10:33:43 +02:00
StaffController.php	Removed unnecessary code from StaffController.php	2020-06-29 14:26:39 +02:00
UserController.php	Fixes	2020-06-29 13:55:47 +02:00
WashingMachineController.php	fixed wrong migration name of external link	2020-06-24 08:53:07 +02:00
WashingReservationController.php	Removed:	2020-06-25 13:28:51 +02:00