Commit Graph

92 Commits

Author SHA1 Message Date
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Neerholt 3fe0b1e6e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:30:21 +02:00
Neerholt 6c020e36da Made role controller, added index and create 2020-06-30 11:30:12 +02:00
Vedde f0132bee2c worked on ResourceExtensionController.php and added resource_extension migration 2020-06-30 11:27:39 +02:00
Sebastian Davaris c1627c2fa4 Fixed UserSeeder.php. 2020-06-30 10:55:58 +02:00
Sebastian Davaris 7f91e76d90 Fixed UserSeeder.php. 2020-06-30 10:09:31 +02:00
Vedde 0dcc5ab6e8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 09:33:33 +02:00
Vedde c8327871a4 edited PermissionSeeder.php 2020-06-30 09:33:22 +02:00
frederikpyt 2814490a8a Merge remote-tracking branch 'origin/master' 2020-06-30 09:19:56 +02:00
frederikpyt af228f705d Removed unnecessary files 2020-06-30 09:19:35 +02:00
Vedde 2210bd9718 Merge x2 2020-06-30 08:56:19 +02:00
Vedde 139e62dedf Merge 2020-06-30 08:55:41 +02:00
Sebastian Davaris 620902d7d8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:53:44 +02:00
frederikpyt 8445a22732 Created files for gallery 2020-06-30 08:52:46 +02:00
Neerholt fd87e133e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:50:14 +02:00
Neerholt 20bfcb2c97 Made gallery, video, album, migrations 2020-06-30 08:50:04 +02:00
Sebastian Davaris c609cf78ff Added more permissions to the seeder. 2020-06-30 08:49:39 +02:00
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
Anders d6a9aa0c4f Merge remote-tracking branch 'origin/master' 2020-06-30 08:21:45 +02:00
Anders c732d8eec0 Fixed menuplan create 2020-06-30 08:21:36 +02:00
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Sebastian Davaris 988ceb7c8a Fixed error AND 0x01 2020-06-29 14:49:57 +02:00
Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
2020-06-29 14:48:53 +02:00
Sebastian Davaris eb749e58a5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:28:17 +02:00
Sebastian Davaris b5ede965fe Began working on security. 2020-06-29 14:28:09 +02:00
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00
Anders b942d8c1e1 Updated create_staff_table 2020-06-29 13:29:19 +02:00
Neerholt b48907b523 Made staff migrate 2020-06-29 13:27:48 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 7b691b8c94 added event migration 2020-06-29 12:54:43 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Sebastian Davaris 0adc1ebf02 Added Contact-stuff 2020-06-29 08:50:50 +02:00
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00
Vedde 27b4f48af2 updated controller 2020-06-25 09:15:21 +02:00
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00
Vedde 643ac9e3de added values to migrations. 2020-06-10 12:29:18 +02:00
Vedde fa6fdcd690 Added a few models and migrations 2020-06-09 10:45:16 +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 da00009fe9 Initial Commit 2020-06-08 10:04:45 +02:00