Commit Graph

283 Commits

Author SHA1 Message Date
Sebastian Davaris 7f91e76d90 Fixed UserSeeder.php. 2020-06-30 10:09:31 +02:00
Sebastian Davaris 2409fec66e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:04:16 +02:00
Sebastian Davaris 358b218d23 Finished security middlewarez 2020-06-30 10:04:06 +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
Sebastian Davaris 0a89d24319 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 09:21:33 +02:00
Sebastian Davaris 14b745dc2b Added more permissions to the seeder.. 2020-06-30 09:21:21 +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 c794a9e055 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:56:25 +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 ccc45f485c Merge remote-tracking branch 'origin/master' 2020-06-30 08:52:59 +02:00
frederikpyt 8445a22732 Created files for gallery 2020-06-30 08:52:46 +02:00
Vedde 3b2fec0e09 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:52:20 +02:00
Vedde 66e8b2e3d8 Modified EventController.php. 2020-06-30 08:52:11 +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 a91118a2b3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:49:51 +02:00
Sebastian Davaris c609cf78ff Added more permissions to the seeder. 2020-06-30 08:49:39 +02:00
frederikpyt 8e8a6c8d6b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:48:58 +02:00
frederikpyt 223ba6dc41 Created files for gallery 2020-06-30 08:48:51 +02:00
Anders 1cf39cbbd2 Merge remote-tracking branch 'origin/master' 2020-06-30 08:35:49 +02:00
Anders d93fff517a Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel) 2020-06-30 08:35:40 +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
Sebastian Davaris 4a0840b104 Modified base.blade.php? 2020-06-30 08:24:29 +02:00
frederikpyt 2f22ae275e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:23:14 +02:00
frederikpyt 2562c69c36 Fixed delete on indexes 2020-06-30 08:23:07 +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
frederikpyt c803d12299 Frontend support for role selection in user create, read and update. 2020-06-30 08:03:42 +02:00
frederikpyt a4ff9a3590 Fixed calender CSS 2020-06-30 07:45:58 +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
Vedde 7234304496 worked on event blade files. 2020-06-29 14:48:31 +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 45a7302640 Removed unnecessary code from StaffController.php 2020-06-29 14:26:39 +02:00
frederikpyt 5a136c537c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:11:27 +02:00
frederikpyt e329f3f383 Fixes 2020-06-29 14:11:15 +02:00
Anders 58da7e8136 Merge remote-tracking branch 'origin/master' 2020-06-29 14:08:32 +02:00
Anders b32a782b17 Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index 2020-06-29 14:08:26 +02:00
frederikpyt 7fb4920354 Fixes 2020-06-29 13:55:47 +02:00
frederikpyt 357c046e44 Fixes 2020-06-29 13:47:18 +02:00
frederikpyt 204a7497e0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:38:11 +02:00
frederikpyt 5e624d7561 Fixes 2020-06-29 13:38:05 +02:00
Neerholt 8df9869f28 remove , 2020-06-29 13:36:51 +02:00
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00