b790d2cf65
Fixes
2020-06-29 08:15:11 +02:00
09040f0a36
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 08:14:01 +02:00
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
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
Sebastian Davaris
a84f1729f0
Fixed Vector 0x01
2020-06-26 13:17:18 +02:00
Sebastian Davaris
22c578bc4b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-26 13:14:10 +02:00
Sebastian Davaris
4173986df7
Fixed Routes in base.blade.php
2020-06-26 13:14:02 +02:00
Neerholt
44e70232cd
Kinda Tryna fix
2020-06-26 13:11:24 +02:00
Sebastian Davaris
df8eb6c8cb
Finished calendar.js (for now)
2020-06-26 13:07:57 +02:00
Sebastian Davaris
812ff6e855
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-26 12:51:16 +02:00
Sebastian Davaris
de607a2d3c
Fixed basic calendar functionality
2020-06-26 12:51:05 +02:00
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
Sebastian Davaris
ecf1488bef
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-26 10:52:39 +02:00
Sebastian Davaris
933172777f
Working on calendar.js some more..
2020-06-26 10:52:26 +02:00
8569496d3d
Renamed Booking to Reservationer - Removed reused washing-reservations.index
2020-06-26 09:15:40 +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
659fe23bb7
Menu plan form fix
2020-06-26 08:20:43 +02:00
Neerholt
c917a26738
Merge remote-tracking branch 'origin/master'
2020-06-26 08:16:05 +02:00
ff1fbaf53f
Added href to the first 3 buttons in the menu button.
...
(Missing routing to the last 3)
2020-06-26 08:07:12 +02:00
Neerholt
47f687d12c
idk kev
2020-06-25 18:43:46 +02:00
Neerholt
bbd9a26b91
Create pages fix
2020-06-25 16:16:08 +02:00
Neerholt
795f7a919b
Fix menu plan index
2020-06-25 15:29:43 +02:00
1d08ddbf58
Fixed mistakes
2020-06-25 15:11:59 +02:00
8bda01c1dc
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 15:02:06 +02:00
bad4196e95
bleh
2020-06-25 15:01:33 +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
7f083860f1
Fixes
2020-06-25 14:52:04 +02:00
3976d37af2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 14:24:08 +02:00
9e9f48aca1
Edited frontpage
2020-06-25 14:23:52 +02:00
65ec87af51
Added washing-reservations
2020-06-25 13:30:58 +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
db3620763f
Merge remote-tracking branch 'origin/master'
2020-06-25 13:02:58 +02:00
103dfa6830
(Maybe) Fixed Menuplans
2020-06-25 13:01:53 +02:00
49d6853170
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:50:23 +02:00
635d91915a
Fixes
2020-06-25 12:50:09 +02:00
f3956e1e9b
Added Booking to base.blade.php
2020-06-25 12:48:44 +02:00
80bf962f38
Le fix is not fix le
2020-06-25 12:37:17 +02:00
Neerholt
6447d9274f
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:22:43 +02:00
Neerholt
9a3d16bc61
Add some routes to menuplan
2020-06-25 12:22:22 +02:00
233a1e6add
Added BookingController.php, uncommented routed code in admin/layout/base.blade.php,
2020-06-25 11:56:38 +02:00
10dc32c701
updated menuplan controller
2020-06-25 10:34:10 +02:00
c627e4e1af
Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index
2020-06-25 09:04:23 +02:00
Sebastian Davaris
32da29dd49
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 08:28:48 +02:00
Sebastian Davaris
47161e2615
Working on calendar.js
2020-06-25 08:28:36 +02:00
bf57ec9d99
Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines
2020-06-25 08:12:53 +02:00
4ed33e4f99
Edited washing-machines, app\root\index & admin\layout\base
2020-06-24 14:19:55 +02:00
frederikpyt
Neerholt
Vedde
Sebastian Davaris
Anders