Commit Graph

188 Commits

Author SHA1 Message Date
Anders 01f9502653 Removes - Console.log in feedback(s) 2020-08-03 13:44:53 +02:00
Neerholt e8f6c2242a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-03 13:21:56 +02:00
Neerholt e2847e9959 Fixed PageNation 2020-08-03 13:21:47 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
Anders ffb347b51d Merge remote-tracking branch 'origin/master' 2020-08-03 10:37:04 +02:00
Anders b4263d8891 Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
2020-08-03 10:36:57 +02:00
Neerholt d7c4f2052b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/routes/web.php
2020-08-03 10:09:54 +02:00
Neerholt 84cd760b0f Made ris ros filter 2020-08-03 10:08:03 +02:00
Anders 1f5660001e Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
2020-07-31 11:14:24 +02:00
Anders d8ff713b90 Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles 2020-07-31 10:38:10 +02:00
frederikpyt 38f8bfa0c9 Fixed bugs 2020-07-30 15:25:37 +02:00
frederikpyt cf4559874a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 10:12:00 +02:00
frederikpyt 06346d9675 Fixed css and created the washing reservation index for app 2020-07-30 10:11:52 +02:00
Anders 0ab41524c6 Added an account page for admin site 2020-07-30 08:42:01 +02:00
victor 4826725e07 Made washing-reservations search 2020-07-29 15:27:07 +02:00
frederikpyt 13c2e56e34 Filter search css 2020-07-29 13:58:19 +02:00
frederikpyt 657acbd6eb Added User on washing reservation show 2020-07-29 13:43:18 +02:00
frederikpyt faec1f66c5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 11:53:46 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +02:00
victor 26c28d8e54 Made filter search 2020-07-29 09:49:54 +02:00
Anders fd3f2de668 Merge remote-tracking branch 'origin/master' 2020-07-28 14:54:26 +02:00
Anders 556e6cf25a You are now able to remove people who have signed up for events - With routing etc. 2020-07-28 14:54:19 +02:00
victor 63f2cc31d9 Fix live search again 2020-07-28 14:23:54 +02:00
victor f6d762ba46 Revert "Added no match found on live search"
This reverts commit 47a07c61
2020-07-28 13:21:22 +02:00
victor a90c9aa8cd big smoke 2020-07-28 13:21:02 +02:00
victor 47a07c6174 Added no match found on live search 2020-07-28 11:31:39 +02:00
victor 2dba1fd8f7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 11:07:41 +02:00
victor c9cb3e99cd Jeg er ikke sikker 2020-07-28 11:07:33 +02:00
Anders 8d8b5491c9 Removed unused/commented code 2020-07-28 10:17:00 +02:00
victor 9a5be4e280 Name fix for contact 2020-07-28 09:23:28 +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 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
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
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
frederikpyt 2846dac2dc Fixed Washing machine creation and editing 2020-07-01 10:30:28 +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