Commit Graph

224 Commits

Author SHA1 Message Date
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00
Anders b942d8c1e1 Updated create_staff_table 2020-06-29 13:29:19 +02:00
Neerholt b48907b523 Made staff migrate 2020-06-29 13:27:48 +02:00
Neerholt 5e226e03c4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:20:59 +02:00
Neerholt db088ad9ba Fix delete controller 2020-06-29 13:20:48 +02:00
frederikpyt 8f74a8b649 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:19:33 +02:00
frederikpyt c6ffa26baa Fixes 2020-06-29 13:18:58 +02:00
Anders 42aa2b5c83 Renamed contact to contacts in app 2020-06-29 13:18:39 +02:00
Neerholt b1f2fdd2b7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
2020-06-29 13:09:29 +02:00
Neerholt 08d5436f22 Fix delete controller 2020-06-29 13:08:39 +02:00
frederikpyt 626dddbb06 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:07:28 +02:00
frederikpyt f16018cb15 Kontakt frontend 2020-06-29 13:07:17 +02:00
Anders 9bc7369ffe Merge remote-tracking branch 'origin/master' 2020-06-29 12:56:14 +02:00
Anders f7786be665 Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php 2020-06-29 12:56:08 +02:00
frederikpyt 8047e33ad3 Kontakt frontend 2020-06-29 12:45:27 +02:00
Neerholt e00da21506 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:37:03 +02:00
Neerholt f61f67d0bc slette s 2020-06-29 12:36:07 +02:00
frederikpyt 04ad9f6d1c Kontakt frontend 2020-06-29 12:35:24 +02:00
frederikpyt 79d6ffe52d Merge remote-tracking branch 'origin/master' 2020-06-29 12:32:46 +02:00
frederikpyt 7d80b014c7 Kontakt frontend 2020-06-29 12:32:34 +02:00
Anders 91a34f3d08 Merge remote-tracking branch 'origin/master' 2020-06-29 12:29:30 +02:00
Anders 600bbe7746 Fixed routing and backend to staff section 2020-06-29 12:29:23 +02:00
frederikpyt 0e7bf85d26 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:25:04 +02:00
frederikpyt d37c0c63f6 Kontakt frontend 2020-06-29 12:24:45 +02:00
Neerholt 85846eab6c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:23:08 +02:00
Neerholt 6820dc3e3b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:21:27 +02:00
Neerholt 3f5886223b idk kev 2020-06-29 12:21:16 +02:00
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +02:00
Anders 97af5273be Merge remote-tracking branch 'origin/master' 2020-06-29 11:57:16 +02:00
Anders f5cdf848a3 Added Staff section and routing + some backend (That should be checked out) 2020-06-29 11:57:11 +02:00
Neerholt 76cd9663c2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:48:46 +02:00
Neerholt a0a6f1a9cb Laver edit, show, update,delete controller for contacts 2020-06-29 11:48:36 +02:00
frederikpyt 7641deaeef Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:42:38 +02:00
frederikpyt 137c12cbee Kontakt frontend 2020-06-29 11:41:33 +02:00
Neerholt cee2818046 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:39:22 +02:00
Neerholt c86c067d07 added s to the end of contacts 2020-06-29 11:39:00 +02:00
frederikpyt ad0f61dd51 Kontakt frontend 2020-06-29 11:38:18 +02:00
frederikpyt 78992f6a61 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:34:30 +02:00
frederikpyt b198f830c3 Kontakt frontend 2020-06-29 11:34:21 +02:00
Neerholt 0ce8e109b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:14:19 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Anders 02faa63b98 Removed Fredag-Søndag in menuplans 2020-06-29 11:09:39 +02:00
Anders 469c21645a Added Event route in admins left navbar 2020-06-29 10:56:53 +02:00
frederikpyt 1863d953f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/admin/menuplans/create.blade.php
2020-06-29 10:52:18 +02:00
frederikpyt 0f93f4ca97 Fixes 2020-06-29 10:50:04 +02:00
Anders 7120b85784 Merge remote-tracking branch 'origin/master' 2020-06-29 10:46:35 +02:00
Anders 246ae2235d Removed Fredag-Søndag on menuplan 2020-06-29 10:46:28 +02:00
Neerholt 419672a302 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:41:38 +02:00
Neerholt f952ad33aa Added s til controller 2020-06-29 10:41:27 +02:00
frederikpyt e8f13d81ec Contact frontend 2020-06-29 10:40:34 +02:00