Commit Graph

23 Commits

Author SHA1 Message Date
frederikpyt 072c5c65ab Fixes and todo's 2020-08-05 08:10:38 +02:00
frederikpyt c04f26eaa7 fixes 2020-08-04 17:45:10 +02:00
frederikpyt 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
2020-08-04 16:52:42 +02:00
frederikpyt 50d8079da2 fixes 2020-08-04 15:29:21 +02:00
Neerholt 9dd09f2205 Made it so they can now make there own dynamic guide 2020-08-04 15:29:08 +02:00
Anders 20d73c047f Fixed date and stuff 2020-08-03 14:47:06 +02:00
frederikpyt 093a944980 Fix 2020-08-03 13:50:27 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
victor 4826725e07 Made washing-reservations search 2020-07-29 15:27:07 +02:00
frederikpyt 657acbd6eb Added User on washing reservation show 2020-07-29 13:43:18 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +02:00
Neerholt 519bd70ace
Merge branch 'master' into LiveSearch 2020-07-27 14:23:13 +02:00
victor b9633d36a9 Made Live search is done 2020-07-27 16:03:49 +02:00
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
frederikpyt f0a203fbb2 Rearranged admin panel site navigation 2020-07-01 09:27:18 +02:00
frederikpyt 3aee5515b1 Added confirmation to row deletion 2020-06-30 14:09:11 +02:00
frederikpyt 2562c69c36 Fixed delete on indexes 2020-06-30 08:23: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 0ba866ec29 Fixes 2020-06-29 08:13:53 +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
frederikpyt 7f083860f1 Fixes 2020-06-25 14:52:04 +02:00
Anders 65ec87af51 Added washing-reservations 2020-06-25 13:30:58 +02:00