Commit Graph

60 Commits

Author SHA1 Message Date
Anders ca3e2689ea Frontpage fixed 2020-07-27 14:58:56 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Anders a174b47258 Fail message when there is no activity.
You can now use the button "Kontoret" in the menu navbar
2020-07-01 11:44:14 +02:00
Anders 03b7f4236a Users able to change password 2020-07-01 10:13:49 +02:00
Anders faa865c50f fixed 2020-06-30 14:40:46 +02:00
Anders 709be5ea87 Added account edit and route to it 2020-06-30 14:04:34 +02:00
Anders 56880d31be Log out button for users added 2020-06-30 13:03:41 +02:00
Anders dfd8420270 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Sebastian Davaris 0491bc9b85 Fixed Last normal security. 2020-06-30 10:42:10 +02:00
frederikpyt c074f32bbe Fixes and implementation of forgot password 2020-06-30 10:19:01 +02:00
Sebastian Davaris a91118a2b3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:49:51 +02:00
Anders d93fff517a 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
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Vedde 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
Sebastian Davaris eb749e58a5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:28:17 +02:00
Anders b32a782b17 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
Anders 42aa2b5c83 Renamed contact to contacts in app 2020-06-29 13:18:39 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +02:00
Anders 02faa63b98 Removed Fredag-Søndag in menuplans 2020-06-29 11:09:39 +02:00
Vedde 3f3984ddab Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:28:45 +02:00
Vedde 62d6fe62e3 added temporary trial event fetcher 2020-06-29 10:28:35 +02:00
Sebastian Davaris 03c609175d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/admin/layout/base.blade.php
	skolehjem/resources/views/app/layout/base.blade.php
	skolehjem/routes/web.php
2020-06-29 10:15:56 +02:00
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +02:00
frederikpyt 2726ccadbf Fixes 2020-06-29 09:28:57 +02:00
frederikpyt fc1d7c5a5b Fixes 2020-06-29 09:26:07 +02:00
frederikpyt b8f2c57fc0 Created konto entry in hamburger menu 2020-06-29 09:21:54 +02:00
Sebastian Davaris 1eaa34516b Fixed PhoneController.php 2020-06-29 09:21:17 +02:00
frederikpyt 42e3ece4aa Updated Contact 2020-06-29 09:03:24 +02:00
frederikpyt 8001c46a1e Fixed hamburger menu 2020-06-29 08:35:08 +02:00
frederikpyt b790d2cf65 Fixes 2020-06-29 08:15:11 +02:00
frederikpyt 0ba866ec29 Fixes 2020-06-29 08:13:53 +02:00
Sebastian Davaris 4173986df7 Fixed Routes in base.blade.php 2020-06-26 13:14:02 +02:00
Sebastian Davaris df8eb6c8cb Finished calendar.js (for now) 2020-06-26 13:07:57 +02:00
Sebastian Davaris de607a2d3c Fixed basic calendar functionality 2020-06-26 12:51:05 +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
Anders 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
Anders 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
Anders 1d08ddbf58 Fixed mistakes 2020-06-25 15:11:59 +02:00
Anders 8bda01c1dc Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 15:02:06 +02:00
Anders 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
frederikpyt 7f083860f1 Fixes 2020-06-25 14:52:04 +02:00
frederikpyt 3976d37af2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 14:24:08 +02:00
frederikpyt 9e9f48aca1 Edited frontpage 2020-06-25 14:23:52 +02:00
Anders 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