Commit Graph

330 Commits

Author SHA1 Message Date
Anders 03b7f4236a Users able to change password 2020-07-01 10:13:49 +02:00
Anders ec2479f0b4 Merge remote-tracking branch 'origin/master' 2020-06-30 14:40:54 +02:00
Anders faa865c50f fixed 2020-06-30 14:40:46 +02:00
frederikpyt c505738592 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 14:09:19 +02:00
frederikpyt 3aee5515b1 Added confirmation to row deletion 2020-06-30 14:09:11 +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
Anders 56880d31be Log out button for users added 2020-06-30 13:03:41 +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
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
frederikpyt 2ab54da383 Fix 2020-06-30 12:13:49 +02:00
Neerholt 5bd37db3e2 Made it so roles data kev 2020-06-30 12:11:18 +02:00
Neerholt 1706e12cc8 Merge remote-tracking branch 'origin/master' 2020-06-30 12:09:17 +02:00
Neerholt f46062a9c4 Made it so roles data 2020-06-30 12:08:31 +02:00
frederikpyt 112a8989da Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:07:46 +02:00
frederikpyt c49080f366 Dynamic roles in user create/edit frontend 2020-06-30 12:07:38 +02:00
Neerholt e5493e1888 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:02:45 +02:00
Neerholt 05ec4e0228 Fixed idk kev 2020-06-30 12:02:32 +02:00
frederikpyt b586eceea9 Fix 2020-06-30 12:01:25 +02:00
frederikpyt cab97f1c0a Fix 2020-06-30 11:58:00 +02:00
frederikpyt 778315ff0b Fix 2020-06-30 11:56:31 +02:00
Neerholt 2bb1d83c2d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:55:21 +02:00
Neerholt af6222df97 Fixed Store 2020-06-30 11:55:11 +02:00
frederikpyt 4b4b2b68de Fix 2020-06-30 11:54:17 +02:00
Neerholt e14ba7bdbd Added s 2020-06-30 11:51:20 +02:00
frederikpyt 2b76f26877 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:51:14 +02:00
Neerholt c7c172c44b Controller fix small R 2020-06-30 11:49:58 +02:00
frederikpyt 07389cb8d1 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:49:47 +02:00
frederikpyt 27414ade79 Role implementation 2020-06-30 11:49:17 +02:00
frederikpyt e0142bf977 Fixed deletion 2020-06-30 11:45:54 +02:00
frederikpyt 484641bdee Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:38:35 +02:00
frederikpyt b08422c520 Various fixes 2020-06-30 11:38:28 +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
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
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 bc862a2303 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:56:09 +02:00
Sebastian Davaris c1627c2fa4 Fixed UserSeeder.php. 2020-06-30 10:55:58 +02:00
frederikpyt b878e81822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:46:56 +02:00