vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
147 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

147 Commits

Author SHA1 Message Date
frederikpyt 2e948b29e8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 08:35:16 +02:00
frederikpyt 8001c46a1e Fixed hamburger menu 2020-06-29 08:35:08 +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
frederikpyt b790d2cf65 Fixes 2020-06-29 08:15:11 +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
frederikpyt b03a89463a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/layout/base.blade.php
 2020-06-29 07:53:01 +02:00
frederikpyt 1519b6fab9 Fixes 2020-06-29 07:48:58 +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
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
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
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 8569496d3d Renamed Booking to Reservationer - Removed reused washing-reservations.index 2020-06-26 09:15:40 +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
Neerholt 59deaf5eb3 Menu plan form fix 45 2020-06-26 08:33:30 +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
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
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
Anders ec8eba98c8 Fixed Menu Button (Still unnecessary code in resources->js->navmenu->menu.js) 2020-06-25 15:20:42 +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 65ec87af51 Added washing-reservations 2020-06-25 13:30:58 +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
Sebastian Davaris 3f9eaa7f8d Working on calendar.js again 2020-06-25 13:20:47 +02:00