Commit Graph

11 Commits

Author SHA1 Message Date
Sebastian Davaris f638777878 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
	skolehjem/resources/views/admin/users/index.blade.php
2020-06-30 08:25:18 +02:00
frederikpyt 2562c69c36 Fixed delete on indexes 2020-06-30 08:23:07 +02:00
Sebastian Davaris c823bdd963 Added button to calendar.js 2020-06-29 10:14:47 +02:00
Vedde 354a5952a7 updated Externallink. Should be able to do crud 2020-06-29 09:19:43 +02:00
Vedde b46f8f7b0a changed route name and table data to show correct info 2020-06-29 08:30:31 +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
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 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
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00