frederikpyt 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/app/Http/Controllers/WashingReservationController.php		2020-08-04 16:52:42 +02:00
..
ContactController.php	Made it so they can now make there own dynamic guide	2020-08-04 15:29:08 +02:00
Controller.php	Initial Commit	2020-06-08 10:04:45 +02:00
EventController.php	Session message on fail - Users / Roles / Events	2020-08-04 09:34:56 +02:00
FeedbackController.php	Fixed - Redirect in Event controler	2020-08-03 10:46:48 +02:00
GuideController.php	fixed guide_article	2020-08-04 13:37:06 +02:00
MenuPlanController.php	Session message on fail - Menuplans	2020-08-04 10:11:18 +02:00
PermissionController.php	Updated Controllers	2020-06-25 12:40:26 +02:00
PhoneController.php	Fixed PhoneController.php	2020-06-29 09:21:17 +02:00
ResourceCategoryController.php	Added resource category migration and empty blade files	2020-07-01 09:08:33 +02:00
ResourceController.php	Working on ResourceController.php again..	2020-07-27 08:24:16 +02:00
ResourceExtensionController.php	worked on ResourceExtensionController.php and added resource_extension migration	2020-06-30 11:27:39 +02:00
RolesController.php	Session message on fail - Users / Roles / Events	2020-08-04 09:34:56 +02:00
RootController.php	Permission fixes	2020-07-29 12:18:08 +02:00
UserController.php	Implemented forgot password	2020-08-04 13:21:56 +02:00
UserEventController.php	Changed session messages on fail or success	2020-08-04 08:04:54 +02:00
WashingMachineController.php	Session message on fail - Washing machine	2020-08-04 08:31:14 +02:00
WashingReservationController.php	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-08-04 16:52:42 +02:00