Commit Graph

150 Commits

Author SHA1 Message Date
Sebastian Davaris 903341c1ec Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 08:14:34 +02:00
Anders faa865c50f fixed 2020-06-30 14:40:46 +02:00
Anders 5e60794c1a Added account edit and route to it 2020-06-30 14:05:40 +02:00
Anders 8d7a684b93 Merge remote-tracking branch 'origin/master' 2020-06-30 14:04:41 +02:00
Anders 709be5ea87 Added account edit and route to it 2020-06-30 14:04:34 +02:00
Neerholt ed9e6c9d6a Slet roles 2020-06-30 13:30:01 +02:00
frederikpyt 9f8cf52008 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 13:22:10 +02:00
frederikpyt 9425f5e067 Fixed role implementation on user index 2020-06-30 13:22:02 +02:00
Sebastian Davaris 73387686b5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:41:45 +02:00
Sebastian Davaris 9065d2043b Fixed UserController.php... 2020-06-30 12:41:28 +02:00
Anders dfd8420270 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Sebastian Davaris 52735bc569 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:22:44 +02:00
Sebastian Davaris 68876198ed Working on ResourceController.php. 2020-06-30 12:22:35 +02:00
Neerholt e3c7204961 Added roles to fillable 2020-06-30 12:21:05 +02:00
Neerholt 90ec2b9a68 Added roles to store 2020-06-30 12:17:47 +02:00
Neerholt 5bd37db3e2 Made it so roles data kev 2020-06-30 12:11:18 +02:00
Neerholt f46062a9c4 Made it so roles data 2020-06-30 12:08:31 +02:00
Neerholt 05ec4e0228 Fixed idk kev 2020-06-30 12:02:32 +02:00
Neerholt af6222df97 Fixed Store 2020-06-30 11:55:11 +02:00
Neerholt e14ba7bdbd Added s 2020-06-30 11:51:20 +02:00
Neerholt c7c172c44b Controller fix small R 2020-06-30 11:49:58 +02:00
frederikpyt e0142bf977 Fixed deletion 2020-06-30 11:45:54 +02:00
Neerholt 2840b879ea Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:35:41 +02:00
Neerholt 7f8fa8004f made the role controller done 2020-06-30 11:35:32 +02:00
frederikpyt 78756ab5f0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:31:21 +02:00
frederikpyt df679536de Role frontend 2020-06-30 11:31:12 +02:00
Vedde f0132bee2c worked on ResourceExtensionController.php and added resource_extension migration 2020-06-30 11:27:39 +02:00
Vedde 8415338120 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:57:36 +02:00
Vedde 5b36a52320 worked on ResourceExtensionController.php 2020-06-30 10:57:25 +02:00
Sebastian Davaris 3cfcd980f4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:42:19 +02:00
Sebastian Davaris 0491bc9b85 Fixed Last normal security. 2020-06-30 10:42:10 +02:00
frederikpyt 7c2d7f21d0 Fixes and implementation of forgot password 2020-06-30 10:35:09 +02:00
frederikpyt aea1b0af04 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:19:08 +02:00
frederikpyt c074f32bbe Fixes and implementation of forgot password 2020-06-30 10:19:01 +02:00
Sebastian Davaris 7f91e76d90 Fixed UserSeeder.php. 2020-06-30 10:09:31 +02:00
Sebastian Davaris 358b218d23 Finished security middlewarez 2020-06-30 10:04:06 +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
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
Sebastian Davaris a91118a2b3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:49:51 +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 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