Commit Graph

198 Commits

Author SHA1 Message Date
frederikpyt c49080f366 Dynamic roles in user create/edit frontend 2020-06-30 12:07:38 +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
frederikpyt 4b4b2b68de Fix 2020-06-30 11:54:17 +02:00
frederikpyt 27414ade79 Role implementation 2020-06-30 11:49:17 +02:00
frederikpyt b08422c520 Various fixes 2020-06-30 11:38:28 +02:00
frederikpyt df679536de Role frontend 2020-06-30 11:31:12 +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
frederikpyt b878e81822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:46:56 +02:00
frederikpyt 2a63600135 Fixes 2020-06-30 10:46:49 +02:00
Sebastian Davaris 0491bc9b85 Fixed Last normal security. 2020-06-30 10:42:10 +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 358b218d23 Finished security middlewarez 2020-06-30 10:04:06 +02:00
Sebastian Davaris 620902d7d8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:53:44 +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
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
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 5e624d7561 Fixes 2020-06-29 13:38:05 +02:00
frederikpyt 8f74a8b649 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:19:33 +02:00
frederikpyt c6ffa26baa Fixes 2020-06-29 13:18:58 +02:00
Anders 42aa2b5c83 Renamed contact to contacts in app 2020-06-29 13:18:39 +02:00
frederikpyt 626dddbb06 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 13:07:28 +02:00
frederikpyt f16018cb15 Kontakt frontend 2020-06-29 13:07:17 +02:00
Anders 9bc7369ffe Merge remote-tracking branch 'origin/master' 2020-06-29 12:56:14 +02:00
Anders f7786be665 Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php 2020-06-29 12:56:08 +02:00