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
|
d37c0c63f6
|
Kontakt frontend
|
2020-06-29 12:24:45 +02:00 |
|
frederikpyt
|
30b31e0309
|
Kontakt frontend
|
2020-06-29 12:20:09 +02:00 |
|
Anders
|
f5cdf848a3
|
Added Staff section and routing + some backend (That should be checked out)
|
2020-06-29 11:57:11 +02:00 |
|
frederikpyt
|
137c12cbee
|
Kontakt frontend
|
2020-06-29 11:41:33 +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 |
|
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 |
|
frederikpyt
|
e8f13d81ec
|
Contact frontend
|
2020-06-29 10:40:34 +02:00 |
|
frederikpyt
|
86bf8cbc6e
|
Contact frontend
|
2020-06-29 10:37:42 +02:00 |
|
frederikpyt
|
488995ca37
|
Contact frontend
|
2020-06-29 10:31:24 +02:00 |
|
frederikpyt
|
d4abbfc189
|
Fixes
|
2020-06-29 10:12:58 +02:00 |
|
frederikpyt
|
6bdf7d3447
|
Fixes
|
2020-06-29 09:57:21 +02:00 |
Vedde
|
874f0064a1
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:19:57 +02:00 |
|
Vedde
|
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 |
|
Anders
|
4eb2a29af9
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:47:09 +02:00 |
|
Sebastian Davaris
|
5be4b752d7
|
Finished Menuplan;)
|
2020-06-29 08:43:35 +02:00 |
|
Anders
|
0c3d6dab25
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:34:49 +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 |
|
Vedde
|
4576140d2f
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:31:27 +02:00 |
 Neerholt
|
a7c3a54778
|
Data bliver nu vist på edit siden
|
2020-06-29 08:31:26 +02:00 |
|
Vedde
|
d33a89757d
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:30:48 +02:00 |
|
Vedde
|
b46f8f7b0a
|
changed route name and table data to show correct info
|
2020-06-29 08:30:31 +02:00 |
|
Neerholt
|
7588e05299
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:22:15 +02:00 |
|
Neerholt
|
b1ae0f0964
|
Fix edit siden
|
2020-06-29 08:22:07 +02:00 |
|
Anders
|
8987db9d31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/admin/washing-reservations/index.blade.php
|
2020-06-29 08:19:55 +02:00 |
|
frederikpyt
|
09040f0a36
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 08:14:01 +02:00 |
|
frederikpyt
|
0ba866ec29
|
Fixes
|
2020-06-29 08:13:53 +02:00 |
|
Neerholt
|
7d13933ea7
|
Fix route link til edit på menuplan
|
2020-06-29 08:02:42 +02:00 |
|
Anders
|
f517e53557
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 07:54:41 +02:00 |
|
Vedde
|
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 |
|
Vedde
|
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 |
|
Sebastian Davaris
|
a84f1729f0
|
Fixed Vector 0x01
|
2020-06-26 13:17:18 +02:00 |
|
Neerholt
|
44e70232cd
|
Kinda Tryna fix
|
2020-06-26 13:11:24 +02:00 |
|
Anders
|
c6282b77d1
|
Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations
|
2020-06-26 12:20:20 +02:00 |
|
Anders
|
400f2e563f
|
Removed ID From all admin sites.
Added washing-reservations under washing-machines instead of being alone
|
2020-06-26 12:17:46 +02:00 |
|
Anders
|
8569496d3d
|
Renamed Booking to Reservationer - Removed reused washing-reservations.index
|
2020-06-26 09:15:40 +02:00 |