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

303 Commits

Author SHA1 Message Date
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
Sebastian Davaris fb65c1b9fc Added UserEvent.php 2020-07-28 08:18:45 +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 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
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
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 330b895a35 Fixed redirect 2020-07-01 11:56:44 +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
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
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
Neerholt 7b4610f02f Fix 2020-07-01 09:43:11 +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 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 faa865c50f fixed 2020-06-30 14:40:46 +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 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
Neerholt 5bd37db3e2 Made it so roles data kev 2020-06-30 12:11:18 +02:00
Neerholt f46062a9c4 Made it so roles data 2020-06-30 12:08:31 +02:00
Neerholt 05ec4e0228 Fixed idk kev 2020-06-30 12:02:32 +02:00
Neerholt af6222df97 Fixed Store 2020-06-30 11:55:11 +02:00
Neerholt e14ba7bdbd Added s 2020-06-30 11:51:20 +02:00
Neerholt c7c172c44b Controller fix small R 2020-06-30 11:49:58 +02:00
frederikpyt e0142bf977 Fixed deletion 2020-06-30 11:45:54 +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
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 3cfcd980f4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 10:42:19 +02:00
Sebastian Davaris 0491bc9b85 Fixed Last normal security. 2020-06-30 10:42:10 +02:00
frederikpyt 7c2d7f21d0 Fixes and implementation of forgot password 2020-06-30 10:35:09 +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 7f91e76d90 Fixed UserSeeder.php. 2020-06-30 10:09:31 +02:00
Sebastian Davaris 358b218d23 Finished security middlewarez 2020-06-30 10:04:06 +02:00
Sebastian Davaris 0a89d24319 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 09:21:33 +02:00
Sebastian Davaris 14b745dc2b Added more permissions to the seeder.. 2020-06-30 09:21:21 +02:00
frederikpyt 2814490a8a Merge remote-tracking branch 'origin/master' 2020-06-30 09:19:56 +02:00
frederikpyt af228f705d Removed unnecessary files 2020-06-30 09:19:35 +02:00
Sebastian Davaris 620902d7d8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:53:44 +02:00
frederikpyt ccc45f485c Merge remote-tracking branch 'origin/master' 2020-06-30 08:52:59 +02:00
frederikpyt 8445a22732 Created files for gallery 2020-06-30 08:52:46 +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 a91118a2b3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:49:51 +02:00
frederikpyt 8e8a6c8d6b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:48:58 +02:00
frederikpyt 223ba6dc41 Created files for gallery 2020-06-30 08:48:51 +02:00
Anders d93fff517a Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel) 2020-06-30 08:35:40 +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
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
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
Sebastian Davaris b5ede965fe Began working on security. 2020-06-29 14:28:09 +02:00
Anders 45a7302640 Removed unnecessary code from StaffController.php 2020-06-29 14:26:39 +02:00
frederikpyt 7fb4920354 Fixes 2020-06-29 13:55:47 +02:00
Neerholt 8df9869f28 remove , 2020-06-29 13:36:51 +02:00
frederikpyt c6ffa26baa Fixes 2020-06-29 13:18:58 +02:00
Neerholt 08d5436f22 Fix delete controller 2020-06-29 13:08:39 +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
Neerholt f61f67d0bc slette s 2020-06-29 12:36:07 +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
Neerholt 6820dc3e3b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:21:27 +02:00
Neerholt 3f5886223b idk kev 2020-06-29 12:21:16 +02:00
Anders 97af5273be Merge remote-tracking branch 'origin/master' 2020-06-29 11:57:16 +02:00
Anders f5cdf848a3 Added Staff section and routing + some backend (That should be checked out) 2020-06-29 11:57:11 +02:00
Neerholt a0a6f1a9cb Laver edit, show, update,delete controller for contacts 2020-06-29 11:48:36 +02:00
Neerholt c86c067d07 added s to the end of contacts 2020-06-29 11:39:00 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Neerholt f952ad33aa Added s til controller 2020-06-29 10:41:27 +02:00
Neerholt bb307df506 ikd kev 2020-06-29 10:37:37 +02:00
Neerholt b555af06c7 Lavet contact create controller 2020-06-29 10:30:09 +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
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +02:00
Sebastian Davaris 0afa8a7aa3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 09:21:29 +02:00
Sebastian Davaris 1eaa34516b Fixed PhoneController.php 2020-06-29 09:21:17 +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
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
Neerholt b1ae0f0964 Fix edit siden 2020-06-29 08:22:07 +02:00
Neerholt 7d13933ea7 Fix route link til edit på menuplan 2020-06-29 08:02:42 +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
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00