Commit Graph

92 Commits

Author SHA1 Message Date
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
Sebastian Davaris aa2380023b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-15 08:59:26 +02:00
Sebastian Davaris 07405d575d Added more routes. 2020-06-15 08:59:15 +02:00
Frederikmillingpytlick e73e2aacdc Added admin sites 2020-06-15 08:56:21 +02:00
Frederikmillingpytlick 88b7012f69 Merge remote-tracking branch 'origin/master' 2020-06-11 14:54:05 +02:00
Frederikmillingpytlick a341e61bad Added Images, fonts, vagttelefon and menuplan 2020-06-11 14:52:15 +02:00
Sebastian Davaris 2f0ec75278 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/routes/web.php
2020-06-10 12:31:11 +02:00
Sebastian Davaris 3c02963c24 Began working on more controllers 2020-06-10 12:30:44 +02:00
Vedde 643ac9e3de added values to migrations. 2020-06-10 12:29:18 +02:00
Vedde 2febf83348 Merge remote-tracking branch 'origin/master' 2020-06-10 08:33:15 +02:00
Vedde 2cbc1ddaf9 added user folder/view
updated EventController.php & web.php
2020-06-10 08:33:06 +02:00
Sebastian Davaris 9c6d8c04cd Merge remote-tracking branch 'origin/master' 2020-06-10 08:25:57 +02:00
Sebastian Davaris af76cbca87 Added Swagger 2020-06-10 08:25:21 +02:00
Vedde fa6fdcd690 Added a few models and migrations 2020-06-09 10:45:16 +02:00
Sebastian Davaris 5c6f37eaf7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-09 10:02:20 +02:00
Sebastian Davaris bb03c4fc93 Added Models 2020-06-09 10:02:07 +02:00
Vedde 7eaa3311cb Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts. 2020-06-09 09:05:07 +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 fbf1673fc0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-08 15:08:58 +02:00
Sebastian Davaris bd23d10a9d Added first seeder. 2020-06-08 15:08:46 +02:00
Vedde e2562f6960 added migrations of events, feedback, washing machines, and calendar events.
changed migration users table name into name first and name last.
added migration external link table string: name and link.
2020-06-08 14:59:25 +02:00
Vedde cb20b1f862 added feedback, external link and washing reservations migrations 2020-06-08 10:56:37 +02:00
Sebastian Davaris 5abeec4ceb Added E/R 2020-06-08 10:06:38 +02:00
Sebastian Davaris da00009fe9 Initial Commit 2020-06-08 10:04:45 +02:00