Anders dfd8420270 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/MenuPlan.php		2020-06-30 12:40:02 +02:00
..
bookings	Working on calendar.js some more..	2020-06-26 10:52:26 +02:00
contacts	Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index	2020-06-29 14:08:26 +02:00
events	updated event migration and admin stuff	2020-06-29 12:53:08 +02:00
feedbacks	Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel)	2020-06-30 08:35:40 +02:00
layout	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 10:15:56 +02:00
menuplans	Edited menuplan - Can now be seen by users	2020-06-30 12:38:02 +02:00
root	Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index	2020-06-29 14:08:26 +02:00
users	Fixed Last normal security.	2020-06-30 10:42:10 +02:00
vagttelefons	Fixed mistakes	2020-06-25 15:11:59 +02:00
washing-reservations	Finished calendar.js (for now)	2020-06-26 13:07:57 +02:00