Commit Graph

73 Commits

Author SHA1 Message Date
Vedde 00f798b940 Merge remote-tracking branch 'origin/master' 2020-06-25 09:15:30 +02:00
Vedde 27b4f48af2 updated controller 2020-06-25 09:15:21 +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
Anders bf57ec9d99 Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines 2020-06-25 08:12:53 +02:00
Anders 4ed33e4f99 Edited washing-machines, app\root\index & admin\layout\base 2020-06-24 14:19:55 +02:00
Anders d7d33d1696 Added Bookings to admin panel - Fixed app->root->index.blade.php 2020-06-24 11:21:16 +02:00
Sebastian Davaris ef58701a6e Fixed "Le Fix" Error 0x01 2020-06-24 10:33:43 +02:00
Sebastian Davaris 730e77b0e0 Fixed detector.php 2020-06-24 10:32:07 +02:00
Sebastian Davaris e8d44d7852 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-24 10:15:49 +02:00
frederikpyt d4d0615a4e Merge remote-tracking branch 'origin/master' 2020-06-24 09:26:53 +02:00
frederikpyt 7cb1fe6ed6 Moved files 2020-06-24 09:25:59 +02:00
Sebastian Davaris 9690a30437 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-24 08:55:07 +02:00
Sebastian Davaris 39ecd64d04 Calendar stuff. 2020-06-24 08:54:56 +02:00
Vedde ccddf4d2f3 fixed wrong migration name of external link
fixed wrong path on controller view
2020-06-24 08:53:07 +02:00
Vedde 6a0a46453f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/Http/Controllers/EventController.php
2020-06-24 08:25:00 +02:00
Vedde e2ab661dc2 fixed path 2020-06-24 08:24:45 +02:00
Sebastian Davaris 79af2dee20 Fixed Controller dependencies. 2020-06-24 08:23:15 +02:00
Sebastian Davaris e6244027bd Fixed ViewDetector. 2020-06-24 08:21:00 +02:00
Vedde fb90868be6 Merge remote-tracking branch 'origin/master' 2020-06-24 07:40:33 +02:00
Sebastian Davaris dd5a9fdbc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/js/navmenu/menu.js
2020-06-23 15:34:12 +02:00
Sebastian Davaris 8ac68ef7b9 Added FontAwesome 2020-06-23 15:32:42 +02:00
Vedde a6c20f8ee8 Merge remote-tracking branch 'origin/master' 2020-06-23 12:01:45 +02:00
frederikpyt d5ddc0901c Created Calender 2020-06-23 12:01:27 +02:00
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00
Vedde dbe6a4dcfe changed return view to Response::detect on controllers 2020-06-23 08:15:44 +02:00
Sebastian 4ddc765082 Got the mobile route to work 2020-06-23 06:42:43 +02:00
Sebastian 070ff2e3c6 Implemented first mobile detected route:) 2020-06-22 21:08:09 +02:00
Sebastian f5fd0eb5bd Added Mobile Detection. 2020-06-22 20:55:40 +02:00
Vedde 8ac8930844 Merge remote-tracking branch 'origin/master' 2020-06-22 15:28:32 +02:00
Vedde c31a3e2c11 updated controller and layout blade 2020-06-22 15:28:20 +02:00
Sebastian Davaris fed853093b Last 22-06 2020-06-22 15:25:39 +02:00
Vedde 4a8336e677 Merge remote-tracking branch 'origin/master' 2020-06-22 14:57:21 +02:00
Vedde 5dcae7895a updated controller 2020-06-22 14:57:11 +02:00
Sebastian Davaris 3a345b1417 Fixed Routes and blades. 2020-06-22 14:53:00 +02:00
Sebastian Davaris 9c3796220f Fixed blade references. 2020-06-22 10:08:18 +02:00
Sebastian Davaris e056567f57 Fixed UserController.php 2020-06-19 08:15:24 +02:00
Sebastian Davaris ca4bcbd5be Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-18 08:01:53 +02:00
Sebastian Davaris 06bab0a120 Working on controllers 2020-06-18 08:01:42 +02:00
frederikpyt fe9a97656f Updated hrefs 2020-06-17 11:28:48 +02:00
frederikpyt 99c2b16752 Changed create.blade.php 2020-06-17 09:08:26 +02:00
Frederikmillingpytlick 7478766927 Created views 2020-06-16 09:06:45 +02:00
Frederikmillingpytlick 60bd31e54b Created, moved and renamed views 2020-06-16 09:04:25 +02:00
Sebastian Davaris a2c7d619b1 Added docs.xlsx 2020-06-16 08:28:37 +02:00
Sebastian Davaris 9212a543f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-16 08:13:36 +02:00
Sebastian Davaris 6106f67fe7 Began updating the View-routes. 2020-06-16 08:13:24 +02:00
Frederikmillingpytlick 5ce1e69d65 Fixes 2020-06-15 15:09:13 +02:00
Frederikmillingpytlick eb2ce43928 Fixes on Menuplan sites 2020-06-15 12:42:09 +02:00
Frederikmillingpytlick 390969cf96 Added Menuplan sites 2020-06-15 12:29:03 +02:00
Frederikmillingpytlick 563f5ac694 Edited read.blade.php 2020-06-15 11:29:38 +02:00
Frederikmillingpytlick a840a4b2f0 Fixes 2020-06-15 11:28:37 +02:00