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

732 Commits

Author SHA1 Message Date
frederikpyt c04f26eaa7 fixes 2020-08-04 17:45:10 +02:00
frederikpyt 4d7acfa6bd fixes 2020-08-04 17:06:46 +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 1011165ca0 fixes 2020-08-04 16:50:08 +02:00
frederikpyt 5aa1995cb8 fixes 2020-08-04 16:35:38 +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 d15f406059 Fail message when making a reservation with taken machine and time 2020-08-04 15:09:10 +02:00
frederikpyt 2a3a728fa3 fixes 2020-08-04 14:27:11 +02:00
frederikpyt 9d52e2e621 fixes 2020-08-04 14:23:07 +02:00
frederikpyt 5973b94247 Merge remote-tracking branch 'origin/master' 2020-08-04 14:11:33 +02:00
frederikpyt 66f7e3b86b fixes 2020-08-04 14:11:05 +02:00
Anders c8b85a6c9b fixed guide_article 2020-08-04 13:37:06 +02:00
Anders 9ed3faedfe fixed table name guideArticles -> guide_articles 2020-08-04 13:35:16 +02:00
frederikpyt f5a0174939 Merge remote-tracking branch 'origin/master' 2020-08-04 13:23:42 +02:00
frederikpyt 694bd35b33 Implemented forgot password 2020-08-04 13:21:56 +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 408eb7090b Fixed CSS 2020-08-04 10:40:01 +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 e8de894ae7 Merge remote-tracking branch 'origin/master' 2020-08-04 08:05:07 +02:00
Anders f551d4c59f Changed session messages on fail or success 2020-08-04 08:04:54 +02:00
frederikpyt 84a1045747 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 15:02:36 +02:00
frederikpyt 4fe015a74c Fix 2020-08-03 15:02:26 +02:00
Anders 20d73c047f Fixed date and stuff 2020-08-03 14:47:06 +02:00
frederikpyt 0e9c054a12 Fix 2020-08-03 14:27:40 +02:00
frederikpyt 898228637c Fix 2020-08-03 14:26:58 +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
Neerholt 679de4872d fixed 2020-08-03 13:14:58 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
Anders 7abfbe27b2 Merge remote-tracking branch 'origin/master' 2020-08-03 11:17:47 +02:00
Anders 11e3958f0a Added - orderBy to own events & own reservations 
Fixed - confirm message when deleting events
 2020-08-03 11:17:36 +02:00
frederikpyt 5ad6fb129b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 10:48:24 +02:00
frederikpyt 91f51d0689 Fixed css 2020-08-03 10:48:17 +02:00
Anders 90b58a8586 Fixed - Redirect in Event controler 
Fixed - orderBy function when searching, in Event & Feedback
 2020-08-03 10:46:48 +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
frederikpyt 93198e5a54 Fixed css 2020-08-03 09:53:57 +02:00
Anders c2a90c69f9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/resources/views/app/users/editpass.blade.php
 2020-08-03 09:43:51 +02:00
Anders f2895a00e3 Started working on a better see password button 2020-08-03 09:42:17 +02:00
frederikpyt 09fa8ce007 Fixed permissions 2020-08-03 09:39:32 +02:00
frederikpyt 52f71abdd5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 09:09:53 +02:00
frederikpyt b0b2a7b4f0 Fixed css 2020-08-03 09:09:46 +02:00
Anders 5f6546e399 Merge remote-tracking branch 'origin/master' 2020-08-03 08:54:35 +02:00
Anders 1d63879117 Added "orderBy" function to event and feedback. 2020-08-03 08:46:38 +02:00
frederikpyt 073938a469 Fixed css 2020-08-03 08:45:45 +02:00
frederikpyt f14dc22d92 Fixed permissions, seeders and security 2020-08-03 08:35:20 +02:00
frederikpyt 27fd564e9f Fixed permissions, seeders and security 2020-08-03 08:33:11 +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
Anders 56cbe7ad41 Added success message when you change credentials 
Added "see password" button - With CSS & Script (Script in file)
 2020-07-31 09:28:58 +02:00
frederikpyt 38f8bfa0c9 Fixed bugs 2020-07-30 15:25:37 +02:00
frederikpyt ab12a46943 Fixed bugs 2020-07-30 14:52:40 +02:00
frederikpyt 0e77da93b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 14:51:50 +02:00
frederikpyt 6a3068c95c Fixed bugs 2020-07-30 14:51:43 +02:00
frederikpyt 991db2bab0 Fixed bugs 2020-07-30 14:51:23 +02:00
Anders e599d09aa7 Correct route to feedbacks x2 2020-07-30 14:51:03 +02:00
Anders 986a62009d Correct route to feedbacks 2020-07-30 14:47:22 +02:00
frederikpyt 6f11313362 Updated Seeders 2020-07-30 14:43:14 +02:00
frederikpyt 264c44529a Updated Seeders 2020-07-30 14:38:32 +02:00
frederikpyt 666e8cb7f3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 12:28:11 +02:00
frederikpyt be575a9515 Updated Seeders 2020-07-30 12:28:05 +02:00
Anders f4ba4f6c45 Edited text 2020-07-30 12:20:52 +02:00
Neerholt bad88a5e51 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 11:03:11 +02:00
Neerholt 7830e31b21 Roles are now searchable 2020-07-30 11:02:41 +02:00
Anders b4f3be91e2 Link on front page are now centered 2020-07-30 10:34:00 +02:00
Anders f36f460b14 Front Page now has all useable buttons and links. 
Added "Are you sure" when you unsubscribe from an event
 2020-07-30 10:31:04 +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
Neerholt 84b71731d9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 09:17:37 +02:00
Neerholt 62d73d0894 Vaskemaskine search er kogt 2020-07-30 09:17:27 +02:00
Anders 0ab41524c6 Added an account page for admin site 2020-07-30 08:42:01 +02:00
frederikpyt 4a1002edf3 Added more svg icons to the hamburger menu 2020-07-30 08:41:09 +02:00
frederikpyt 9a6e1c4c4c Fixed bug 2020-07-30 08:20:30 +02:00
Anders 7f8b6a3222 Merge remote-tracking branch 'origin/master' 2020-07-29 15:28:28 +02:00
Anders d0c8adf7f4 Added store, update, edit to UserEventController.php 2020-07-29 15:28:21 +02:00
victor d5ee1a2146 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 15:27:18 +02:00
victor 4826725e07 Made washing-reservations search 2020-07-29 15:27:07 +02:00
Anders 0c5cb360f2 User can now remove themselves from an event - And get a success message after they've done so. 
Removed user_id from washingReservation
 2020-07-29 14:59:35 +02:00
frederikpyt d6fc1b63b0 Fixed bug 2020-07-29 14:50:09 +02:00
frederikpyt 30fb3b3cc0 Fixed bug 2020-07-29 14:36:11 +02:00
victor 0dd262d50c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 13:59:59 +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
victor a779b7325d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 13:33:20 +02:00
victor 7da57d5e18 Search 2020-07-29 13:33:11 +02:00
frederikpyt 579a34355d Fixed RoleSeeder.php 2020-07-29 13:28:25 +02:00
frederikpyt ef8d1626ec Fixed RoleSeeder.php 2020-07-29 13:21:51 +02:00
frederikpyt 556c0e1ba2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 12:30:12 +02:00
frederikpyt 9a1ca59e5b Permission fixes 2020-07-29 12:30:05 +02:00
Anders bc2323b915 Removed @extends("app.layout.header") from a few blade.php files in app 2020-07-29 12:25:36 +02:00
frederikpyt a5cb2e2cde Permission fixes 2020-07-29 12:18:08 +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 6a4cdbfb17 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 09:50:04 +02:00
victor 26c28d8e54 Made filter search 2020-07-29 09:49:54 +02:00
frederikpyt fc0f97b04e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 15:13:43 +02:00
frederikpyt b4f9065d79 Fixes 2020-07-28 15:13:33 +02:00
frederikpyt 606e13560b Washing Reservation create 2020-07-28 15:03:17 +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
frederikpyt fd2184c654 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/app/layout/base.blade.php
 2020-07-28 14:30:37 +02:00
frederikpyt c4e4d64014 Washing Reservation dynamic content 2020-07-28 14:26:32 +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 cf533bb69f Merge remote-tracking branch 'origin/master' 2020-07-28 10:31:49 +02:00
Anders f9c11e67db Error and succes messages when you change password as user 2020-07-28 10:31:44 +02:00
Sebastian Davaris 22615b5f7d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 10:22:56 +02:00
Sebastian Davaris fbe72420dc Added RoleSeeder.php 2020-07-28 10:22:45 +02:00
Anders 8d8b5491c9 Removed unused/commented code 2020-07-28 10:17:00 +02:00
Anders 4d994d704b Merge remote-tracking branch 'origin/master' 2020-07-28 10:13:52 +02:00
Anders 80725dee12 Made it possible to sign up for events. 
Added fail and success messages when signing up.
Fixed unique keys in migrate
 2020-07-28 10:13:44 +02:00
victor 8cfca540f4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:37 +02:00
victor 9a5be4e280 Name fix for contact 2020-07-28 09:23:28 +02:00
frederikpyt e5e937b76c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:17 +02:00
frederikpyt 282ac8e735 Fixed washing reservation bugs 2020-07-28 09:21:41 +02:00
Anders dcc93ae40c Merge remote-tracking branch 'origin/master' 2020-07-28 08:44:32 +02:00
Anders a679abea52 Route to UserEventController 2020-07-28 08:44:25 +02:00
Vedran Zelen 67ae7746a3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 08:34:58 +02:00
Vedran Zelen b89c1509fe Added comments for easier understanding. 2020-07-28 08:34:10 +02:00
Sebastian Davaris fb65c1b9fc Added UserEvent.php 2020-07-28 08:18:45 +02:00
Vedran Zelen a9cd26075e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 08:06:27 +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
Vedran Zelen a51517036d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 14:37:59 +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
Anders 222a255fe7 Merge remote-tracking branch 'origin/master' 2020-07-27 14:01:12 +02:00
Anders 42449ae091 Comments Added 2020-07-27 14:01:04 +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
Vedran Zelen d99892613b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 13:25:57 +02:00
Vedran Zelen 715b188ecd removed useless comment 2020-07-27 13:24:35 +02:00
Anders 39af9758ee User can now change password 2020-07-27 13:22:45 +02:00
Anders a59c36ab1a Merge remote-tracking branch 'origin/master' 2020-07-27 13:09:56 +02:00
Anders 52a9c6ba1a User can now change password 2020-07-27 13:09:51 +02:00
victor 2dd20ac85a Semi fix live search 2020-07-27 13:07:19 +02:00
Vedran Zelen 4558e8d958 added more comments 
removed silly debug.
 2020-07-27 12:40:45 +02:00
Anders 01b556faba Merge remote-tracking branch 'origin/master' 2020-07-27 12:03:49 +02:00
Vedran Zelen 6979d0c0b4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 10:43:40 +02:00
Vedran Zelen 131ac97afa added helpful comments to models 2020-07-27 10:43:22 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Sebastian Davaris cbb01782fa Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 10:20:49 +02:00
Sebastian Davaris 010322b605 Fixed frontend fuckup #3 2020-07-27 10:20:29 +02:00
Vedran Zelen ce3c8e6459 added comment 2020-07-27 09:35:36 +02:00
Sebastian Davaris 79e5e95695 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/public/css/admin.css
 2020-07-27 08:25:42 +02:00
Sebastian Davaris a755fd9680 Working on ResourceController.php again.. 2020-07-27 08:24:16 +02:00
Neerholt 9c17623518 Live search 2020-07-07 19:29:21 +02:00
frederikpyt 6eb198011f Fixed redirect 2020-07-02 10:06:17 +02:00
frederikpyt 471a2897a5 Fixed redirect 2020-07-01 11:59:48 +02:00
frederikpyt 330b895a35 Fixed redirect 2020-07-01 11:56:44 +02:00
frederikpyt 37f6016199 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 11:54:46 +02:00
frederikpyt cd828725b6 Fixed redirect 2020-07-01 11:54:33 +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 b84b9dbe04 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 11:41:08 +02:00
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
Vedde 32a7e3d3d0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 11:29:58 +02:00
Vedde 9f48d2372f added a few comments 2020-07-01 11:29:45 +02:00
Anders 9870556c5a Now able to delete washing machines 2020-07-01 10:56:04 +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
Neerholt 32b7b3c925 Test commit 2020-07-01 10:29:47 +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
Neerholt eb48514545 Made it so you get send to index after you make,edit and update user information 2020-07-01 09:50:37 +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
Neerholt b929aa2bdb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 09:17:14 +02:00
Neerholt 016613b469 Fix 2020-07-01 09:16:53 +02:00
Vedde a1c73b0224 changed web.php to be correct 2020-07-01 09:15:11 +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
Sebastian Davaris 903341c1ec Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 08:14:34 +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
Sebastian Davaris 36995e4ca9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 13:17:03 +02:00
Anders 56880d31be Log out button for users added 2020-06-30 13:03:41 +02:00
Sebastian Davaris 73387686b5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:41:45 +02:00
Sebastian Davaris 9065d2043b Fixed UserController.php... 2020-06-30 12:41:28 +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
Sebastian Davaris 52735bc569 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 12:22:44 +02:00
Sebastian Davaris 68876198ed Working on ResourceController.php. 2020-06-30 12:22:35 +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