Commit Graph

242 Commits

Author SHA1 Message Date
Anders a679abea52 Route to UserEventController 2020-07-28 08:44:25 +02:00
Anders 0d221c8439 Merge remote-tracking branch 'origin/master' 2020-07-27 14:59:03 +02:00
Anders ca3e2689ea Frontpage fixed 2020-07-27 14:58:56 +02:00
Neerholt 519bd70ace
Merge branch 'master' into LiveSearch 2020-07-27 14:23:13 +02:00
victor b9633d36a9 Made Live search is done 2020-07-27 16:03:49 +02:00
victor f1fb73beec Fix css on live search, live search now works 2020-07-27 14:03:57 +02:00
frederikpyt 4eaf3de6d5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 13:35:15 +02:00
frederikpyt 661d8a0f69 Fixed users and role implementation 2020-07-27 13:35:00 +02:00
frederikpyt 0c8cad9668 Fixed contacts 2020-07-27 13:34:45 +02:00
victor 2dd20ac85a Semi fix live search 2020-07-27 13:07:19 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Sebastian Davaris 010322b605 Fixed frontend fuckup #3 2020-07-27 10:20:29 +02:00
Neerholt 9c17623518 Live search 2020-07-07 19:29:21 +02:00
frederikpyt 471a2897a5 Fixed redirect 2020-07-01 11:59:48 +02:00
Neerholt 4e69768ae8 Lavet controller og et forsøg på GUI 2020-07-01 11:46:29 +02:00
Anders 2368573ee7 Merge remote-tracking branch 'origin/master' 2020-07-01 11:44:20 +02:00
Anders a174b47258 Fail message when there is no activity.
You can now use the button "Kontoret" in the menu navbar
2020-07-01 11:44:14 +02:00
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
frederikpyt 432d9042fd Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 10:32:52 +02:00
frederikpyt 2846dac2dc Fixed Washing machine creation and editing 2020-07-01 10:30:28 +02:00
Anders b4f79c6f5e Merge remote-tracking branch 'origin/master' 2020-07-01 10:13:57 +02:00
Anders 03b7f4236a Users able to change password 2020-07-01 10:13:49 +02:00
frederikpyt 6ecc96ef55 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 09:50:36 +02:00
frederikpyt ca744a33e9 Removed feedback create button from admin dashboard 2020-07-01 09:50:29 +02:00
Neerholt 2b69938251 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 09:43:24 +02:00
Neerholt 7b4610f02f Fix 2020-07-01 09:43:11 +02:00
frederikpyt 6b294972e4 Fixed admin dashboard current user label 2020-07-01 09:39:10 +02:00
frederikpyt ff54108201 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 09:28:03 +02:00
frederikpyt 47daff173c Added "no role" option when updating and creating a user 2020-07-01 09:27:54 +02:00
frederikpyt f0a203fbb2 Rearranged admin panel site navigation 2020-07-01 09:27:18 +02:00
Vedde cb927b9637 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/routes/web.php
2020-07-01 09:13:43 +02:00
Vedde 54a0fd0997 Added resource category migration and empty blade files 2020-07-01 09:08:33 +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 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
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
frederikpyt 2ab54da383 Fix 2020-06-30 12:13:49 +02:00
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