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

188 Commits

Author SHA1 Message Date
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
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
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 e329f3f383 Fixes 2020-06-29 14:11:15 +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 c6ffa26baa Fixes 2020-06-29 13:18:58 +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
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
frederikpyt 8047e33ad3 Kontakt frontend 2020-06-29 12:45:27 +02:00
frederikpyt 04ad9f6d1c Kontakt frontend 2020-06-29 12:35:24 +02:00
frederikpyt 79d6ffe52d Merge remote-tracking branch 'origin/master' 2020-06-29 12:32:46 +02:00
frederikpyt 7d80b014c7 Kontakt frontend 2020-06-29 12:32:34 +02:00
Anders 91a34f3d08 Merge remote-tracking branch 'origin/master' 2020-06-29 12:29:30 +02:00
Anders 600bbe7746 Fixed routing and backend to staff section 2020-06-29 12:29:23 +02:00
frederikpyt d37c0c63f6 Kontakt frontend 2020-06-29 12:24:45 +02:00
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +02:00
Anders f5cdf848a3 Added Staff section and routing + some backend (That should be checked out) 2020-06-29 11:57:11 +02:00
frederikpyt 137c12cbee Kontakt frontend 2020-06-29 11:41:33 +02:00
frederikpyt ad0f61dd51 Kontakt frontend 2020-06-29 11:38:18 +02:00
frederikpyt 78992f6a61 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 11:34:30 +02:00
frederikpyt b198f830c3 Kontakt frontend 2020-06-29 11:34:21 +02:00
Vedde 7f7226e12d "fixed" events migration 2020-06-29 11:05:07 +02:00
Anders 469c21645a Added Event route in admins left navbar 2020-06-29 10:56:53 +02:00
frederikpyt 1863d953f8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/menuplans/create.blade.php
 2020-06-29 10:52:18 +02:00
frederikpyt 0f93f4ca97 Fixes 2020-06-29 10:50:04 +02:00
Anders 7120b85784 Merge remote-tracking branch 'origin/master' 2020-06-29 10:46:35 +02:00
Anders 246ae2235d Removed Fredag-Søndag on menuplan 2020-06-29 10:46:28 +02:00
frederikpyt e8f13d81ec Contact frontend 2020-06-29 10:40:34 +02:00
frederikpyt 86bf8cbc6e Contact frontend 2020-06-29 10:37:42 +02:00
frederikpyt 488995ca37 Contact frontend 2020-06-29 10:31:24 +02:00
Sebastian Davaris 03c609175d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/layout/base.blade.php
	skolehjem/resources/views/app/layout/base.blade.php
	skolehjem/routes/web.php
 2020-06-29 10:15:56 +02:00
Sebastian Davaris c823bdd963 Added button to calendar.js 2020-06-29 10:14:47 +02:00
frederikpyt d4abbfc189 Fixes 2020-06-29 10:12:58 +02:00
frederikpyt 6bdf7d3447 Fixes 2020-06-29 09:57:21 +02:00
Vedde 874f0064a1 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:19:57 +02:00
Vedde 354a5952a7 updated Externallink. Should be able to do crud 2020-06-29 09:19:43 +02:00
Sebastian Davaris c1877cd180 DO NOT TOUCH MENUPLAN-STUFF!!! 2020-06-29 09:08:49 +02:00
Sebastian Davaris 0adc1ebf02 Added Contact-stuff 2020-06-29 08:50:50 +02:00
Anders 4eb2a29af9 Merge remote-tracking branch 'origin/master' 2020-06-29 08:47:09 +02:00
Sebastian Davaris 5be4b752d7 Finished Menuplan;) 2020-06-29 08:43:35 +02:00
Anders 0c3d6dab25 Merge remote-tracking branch 'origin/master' 2020-06-29 08:34:49 +02:00
Sebastian Davaris 4061b590cb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/admin/menuplans/edit.blade.php
	skolehjem/resources/views/admin/menuplans/index.blade.php
	skolehjem/resources/views/admin/menuplans/update.blade.php
 2020-06-29 08:32:52 +02:00
Sebastian Davaris 66ddd32944 Working on MenuPlanController.php 2020-06-29 08:31:36 +02:00
Vedde 4576140d2f Merge remote-tracking branch 'origin/master' 2020-06-29 08:31:27 +02:00
Neerholt a7c3a54778 Data bliver nu vist på edit siden 2020-06-29 08:31:26 +02:00
Vedde d33a89757d Merge remote-tracking branch 'origin/master' 2020-06-29 08:30:48 +02:00
Vedde b46f8f7b0a changed route name and table data to show correct info 2020-06-29 08:30:31 +02:00
Neerholt 7588e05299 Merge remote-tracking branch 'origin/master' 2020-06-29 08:22:15 +02:00
Neerholt b1ae0f0964 Fix edit siden 2020-06-29 08:22:07 +02:00
Anders 8987db9d31 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/resources/views/admin/washing-reservations/index.blade.php
 2020-06-29 08:19:55 +02:00
frederikpyt 09040f0a36 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 08:14:01 +02:00
frederikpyt 0ba866ec29 Fixes 2020-06-29 08:13:53 +02:00
Neerholt 7d13933ea7 Fix route link til edit på menuplan 2020-06-29 08:02:42 +02:00
Anders f517e53557 Merge remote-tracking branch 'origin/master' 2020-06-29 07:54:41 +02:00
Vedde 578dd8d522 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php
 2020-06-26 13:56:47 +02:00
Vedde 89082b281b added things to external link views and worked in controller 2020-06-26 13:56:28 +02:00
Sebastian Davaris b56f3d2a34 Working on MenuPlanController.php 2020-06-26 13:55:04 +02:00
Sebastian Davaris a84f1729f0 Fixed Vector 0x01 2020-06-26 13:17:18 +02:00
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00