d6a9aa0c4f
Merge remote-tracking branch 'origin/master'
2020-06-30 08:21:45 +02:00
c732d8eec0
Fixed menuplan create
2020-06-30 08:21:36 +02:00
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
7234304496
worked on event blade files.
2020-06-29 14:48:31 +02:00
45a7302640
Removed unnecessary code from StaffController.php
2020-06-29 14:26:39 +02:00
7fb4920354
Fixes
2020-06-29 13:55:47 +02:00
Neerholt
8df9869f28
remove ,
2020-06-29 13:36:51 +02:00
c6ffa26baa
Fixes
2020-06-29 13:18:58 +02:00
Neerholt
08d5436f22
Fix delete controller
2020-06-29 13:08:39 +02:00
9bc7369ffe
Merge remote-tracking branch 'origin/master'
2020-06-29 12:56:14 +02:00
f7786be665
Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php
2020-06-29 12:56:08 +02:00
0306717822
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:54:56 +02:00
4020fcf502
updated event migration and admin stuff
2020-06-29 12:53:08 +02:00
Neerholt
f61f67d0bc
slette s
2020-06-29 12:36:07 +02:00
91a34f3d08
Merge remote-tracking branch 'origin/master'
2020-06-29 12:29:30 +02:00
600bbe7746
Fixed routing and backend to staff section
2020-06-29 12:29:23 +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
97af5273be
Merge remote-tracking branch 'origin/master'
2020-06-29 11:57:16 +02:00
f5cdf848a3
Added Staff section and routing + some backend (That should be checked out)
2020-06-29 11:57:11 +02:00
Neerholt
a0a6f1a9cb
Laver edit, show, update,delete controller for contacts
2020-06-29 11:48:36 +02:00
Neerholt
c86c067d07
added s to the end of contacts
2020-06-29 11:39:00 +02:00
Neerholt
ba73440044
Lavet sådan at man kan adde information til contacts databasen
2020-06-29 11:14:07 +02:00
Neerholt
f952ad33aa
Added s til controller
2020-06-29 10:41:27 +02:00
Neerholt
bb307df506
ikd kev
2020-06-29 10:37:37 +02:00
Neerholt
b555af06c7
Lavet contact create controller
2020-06-29 10:30:09 +02:00
Neerholt
3115b337cd
jeg er ikke sikker på hvad der der sket :)
2020-06-29 10:07:42 +02:00
874f0064a1
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:19:57 +02:00
354a5952a7
updated Externallink. Should be able to do crud
2020-06-29 09:19:43 +02:00
Sebastian Davaris
c1877cd180
DO NOT TOUCH MENUPLAN-STUFF!!!
2020-06-29 09:08:49 +02:00
Sebastian Davaris
0adc1ebf02
Added Contact-stuff
2020-06-29 08:50:50 +02:00
Sebastian Davaris
4061b590cb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/resources/views/admin/menuplans/edit.blade.php
skolehjem/resources/views/admin/menuplans/index.blade.php
skolehjem/resources/views/admin/menuplans/update.blade.php
2020-06-29 08:32:52 +02:00
Sebastian Davaris
66ddd32944
Working on MenuPlanController.php
2020-06-29 08:31:36 +02:00
Neerholt
b1ae0f0964
Fix edit siden
2020-06-29 08:22:07 +02:00
Neerholt
7d13933ea7
Fix route link til edit på menuplan
2020-06-29 08:02:42 +02:00
578dd8d522
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/MenuPlanController.php
# skolehjem/resources/views/admin/external-links/index.blade.php
2020-06-26 13:56:47 +02:00
89082b281b
added things to external link views and worked in controller
2020-06-26 13:56:28 +02:00
Sebastian Davaris
b56f3d2a34
Working on MenuPlanController.php
2020-06-26 13:55:04 +02:00
Neerholt
44e70232cd
Kinda Tryna fix
2020-06-26 13:11:24 +02:00
e6d9ddf7d8
Fixed EventController to go to Events instead of bookings
...
Added app->events->index page (needed backend and a foreach loop (foreach event do...))
Changed name in menu 'Vaske Booking Liste' to 'Reservationer'
2020-06-26 08:56:18 +02:00
Neerholt
47f687d12c
idk kev
2020-06-25 18:43:46 +02:00
Neerholt
795f7a919b
Fix menu plan index
2020-06-25 15:29:43 +02:00
Sebastian Davaris
b55fd18c71
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/resources/views/app/root/index.blade.php
2020-06-25 14:56:45 +02:00
a77b266999
Removed:
...
BookingController.php, Booking.php - Was already made being called washing-reservation
Route in web.php (Bookings not needed)
Fixed:
WashingReservationController.php
admin->layout->base (washing-reservations instead of booking)
2020-06-25 13:28:51 +02:00
Sebastian Davaris
3d9cc63241
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 13:20:59 +02:00
1105233f7c
Edited BookingController.php
2020-06-25 13:14:08 +02:00
Neerholt
9a2cb7a98a
idk kev
2020-06-25 12:44:06 +02:00
41db59333b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:40:34 +02:00
b54bffb7a8
Updated Controllers
2020-06-25 12:40:26 +02:00
c51f5812e6
Merge remote-tracking branch 'origin/master'
2020-06-25 12:37:41 +02:00
Anders
Vedde
frederikpyt
Neerholt
Sebastian Davaris