Commit Graph

24 Commits

Author SHA1 Message Date
frederikpyt b4f9065d79 Fixes 2020-07-28 15:13:33 +02:00
frederikpyt c4e4d64014 Washing Reservation dynamic content 2020-07-28 14:26:32 +02:00
frederikpyt 282ac8e735 Fixed washing reservation bugs 2020-07-28 09:21:41 +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 fc1d7c5a5b Fixes 2020-06-29 09:26:07 +02:00
frederikpyt 8001c46a1e Fixed hamburger menu 2020-06-29 08:35:08 +02:00
frederikpyt 0ba866ec29 Fixes 2020-06-29 08:13:53 +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 933172777f Working on calendar.js some more.. 2020-06-26 10:52:26 +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 3f9eaa7f8d Working on calendar.js again 2020-06-25 13:20:47 +02:00
Sebastian Davaris 47161e2615 Working on calendar.js 2020-06-25 08:28:36 +02:00
Sebastian Davaris 8ac68ef7b9 Added FontAwesome 2020-06-23 15:32:42 +02:00
Sebastian Davaris 3a345b1417 Fixed Routes and blades. 2020-06-22 14:53:00 +02:00
Frederikmillingpytlick 5ce1e69d65 Fixes 2020-06-15 15:09:13 +02:00
Frederikmillingpytlick e73e2aacdc Added admin sites 2020-06-15 08:56:21 +02:00
Frederikmillingpytlick a341e61bad Added Images, fonts, vagttelefon and menuplan 2020-06-11 14:52:15 +02:00
Sebastian Davaris bab4c6d72e Removed Vue 2020-06-09 08:38:05 +02:00
Sebastian Davaris 43fc299642 Added Vue 2020-06-09 08:24:20 +02:00
Sebastian Davaris da00009fe9 Initial Commit 2020-06-08 10:04:45 +02:00