Commit Graph

258 Commits

Author SHA1 Message Date
frederikpyt d37c0c63f6 Kontakt frontend 2020-06-29 12:24:45 +02:00
Neerholt 85846eab6c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:23:08 +02:00
Neerholt 6820dc3e3b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:21:27 +02:00
Neerholt 3f5886223b idk kev 2020-06-29 12:21:16 +02:00
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +02:00
Anders 97af5273be Merge remote-tracking branch 'origin/master' 2020-06-29 11:57:16 +02:00
Anders f5cdf848a3 Added Staff section and routing + some backend (That should be checked out) 2020-06-29 11:57:11 +02:00
Neerholt 76cd9663c2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:48:46 +02:00
Neerholt a0a6f1a9cb Laver edit, show, update,delete controller for contacts 2020-06-29 11:48:36 +02:00
frederikpyt 7641deaeef Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:42:38 +02:00
frederikpyt 137c12cbee Kontakt frontend 2020-06-29 11:41:33 +02:00
Neerholt cee2818046 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:39:22 +02:00
Neerholt c86c067d07 added s to the end of contacts 2020-06-29 11:39:00 +02:00
frederikpyt ad0f61dd51 Kontakt frontend 2020-06-29 11:38:18 +02:00
frederikpyt 78992f6a61 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:34:30 +02:00
frederikpyt b198f830c3 Kontakt frontend 2020-06-29 11:34:21 +02:00
Neerholt 0ce8e109b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:14:19 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Anders 02faa63b98 Removed Fredag-Søndag in menuplans 2020-06-29 11:09:39 +02:00
Vedde 7f7226e12d "fixed" events migration 2020-06-29 11:05:07 +02:00
Anders 469c21645a Added Event route in admins left navbar 2020-06-29 10:56:53 +02:00
frederikpyt 1863d953f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/admin/menuplans/create.blade.php
2020-06-29 10:52:18 +02:00
frederikpyt 0f93f4ca97 Fixes 2020-06-29 10:50:04 +02:00
Anders 7120b85784 Merge remote-tracking branch 'origin/master' 2020-06-29 10:46:35 +02:00
Anders 246ae2235d Removed Fredag-Søndag on menuplan 2020-06-29 10:46:28 +02:00
Neerholt 419672a302 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:41:38 +02:00
Neerholt f952ad33aa Added s til controller 2020-06-29 10:41:27 +02:00
frederikpyt e8f13d81ec Contact frontend 2020-06-29 10:40:34 +02:00
frederikpyt 4feb85f91c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:37:49 +02:00
frederikpyt 86bf8cbc6e Contact frontend 2020-06-29 10:37:42 +02:00
Neerholt bb307df506 ikd kev 2020-06-29 10:37:37 +02:00
frederikpyt 94b0d73cc4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 10:31:31 +02:00
frederikpyt 488995ca37 Contact frontend 2020-06-29 10:31:24 +02:00
Neerholt b555af06c7 Lavet contact create controller 2020-06-29 10:30:09 +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
Sebastian Davaris c823bdd963 Added button to calendar.js 2020-06-29 10:14:47 +02:00
frederikpyt d4abbfc189 Fixes 2020-06-29 10:12:58 +02:00
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +02:00
frederikpyt 6bdf7d3447 Fixes 2020-06-29 09:57:21 +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 ac74aa3f82 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:22:01 +02:00
frederikpyt b8f2c57fc0 Created konto entry in hamburger menu 2020-06-29 09:21:54 +02:00
Sebastian Davaris 0afa8a7aa3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:21:29 +02:00
Sebastian Davaris 1eaa34516b Fixed PhoneController.php 2020-06-29 09:21:17 +02:00
Vedde 874f0064a1 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:19:57 +02:00
Vedde 354a5952a7 updated Externallink. Should be able to do crud 2020-06-29 09:19:43 +02:00
Sebastian Davaris 0683b122fe Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:08:58 +02:00