vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
747 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

260 Commits

Author SHA1 Message Date
Anders f988967c22 Guides - Fixed 
Contact - Added phonetimes
 2020-08-05 09:43:53 +02:00
Anders 91f7a4aa05 Merge remote-tracking branch 'origin/master' 2020-08-05 09:24:08 +02:00
Anders a78e7d90f6 Fixed - Guides 
Added - contacts visual (controller coming soon)
 2020-08-05 09:23:57 +02:00
frederikpyt d4e439a39b Fixed css 2020-08-05 08:45:29 +02:00
frederikpyt 072c5c65ab Fixes and todo's 2020-08-05 08:10:38 +02:00
frederikpyt c04f26eaa7 fixes 2020-08-04 17:45:10 +02:00
frederikpyt 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
 2020-08-04 16:52:42 +02:00
frederikpyt 50d8079da2 fixes 2020-08-04 15:29:21 +02:00
Neerholt 4f1ff3a823 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-04 15:29:18 +02:00
Neerholt 9dd09f2205 Made it so they can now make there own dynamic guide 2020-08-04 15:29:08 +02:00
Anders 0e72166ac4 Removed External Links 2020-08-04 15:20:56 +02:00
Anders c8b85a6c9b fixed guide_article 2020-08-04 13:37:06 +02:00
frederikpyt f5a0174939 Merge remote-tracking branch 'origin/master' 2020-08-04 13:23:42 +02:00
Neerholt 210aa00fc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-04 13:21:39 +02:00
Neerholt c223cb967c Made it so they can now make there own dynamic guide 2020-08-04 13:21:23 +02:00
frederikpyt d818d15b85 Implemented forgot password 2020-08-04 10:59:45 +02:00
Anders 9d44432fc2 Session message on fail - Menuplans 2020-08-04 10:11:18 +02:00
Anders 2edfd71de9 Session message on fail - Users / Roles / Events 2020-08-04 09:34:56 +02:00
Anders b59189eac0 Session message on fail - Washing machine 2020-08-04 08:31:14 +02:00
Anders 20d73c047f Fixed date and stuff 2020-08-03 14:47:06 +02:00
frederikpyt ae14081221 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 13:50:34 +02:00
frederikpyt 093a944980 Fix 2020-08-03 13:50:27 +02:00
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
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
frederikpyt 3aee5515b1 Added confirmation to row deletion 2020-06-30 14:09:11 +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 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
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 2a63600135 Fixes 2020-06-30 10:46:49 +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 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