516 Commits

Author	SHA1	Message	Date
Neerholt	a011df41ee	v0.5.14c - Fixed middelware typo	2020-08-10 09:18:00 +02:00
Neerholt	2db8032635	v0.5.14c - Fixed route error when you clicked on participate	2020-08-10 09:17:21 +02:00
Neerholt	9841cbd24e	v0.5.14a -Made cookies more oo oriented	2020-08-08 23:51:24 +02:00
Anders	726cb52aee	v0.5.14 - Fixed signups on event. Added en/dk versions. Added TinyMCEditor on events create/edit. Removed menuplans monday-thursday	2020-08-07 14:11:13 +02:00
Anders	d921803dfd	v0.5.12a - Fixed store of event	2020-08-07 12:59:21 +02:00
Neerholt	376f37da8c	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-07 12:48:15 +02:00
Neerholt	04c280e602	v0.5.12 - Add read more to guides, and made specific pages to read a specific guide	2020-08-07 12:48:08 +02:00
Anders	9a6d1b64c1	v0.5.11 - Changed CKEditor to TinyMCEditor / Removed Monday-Thursday in menu_plans and added a TinyMCEditor instead.	2020-08-07 12:20:15 +02:00
frederikpyt	c268440021	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-08-07 10:59:02 +02:00
frederikpyt	b0eda7f8e7	v0.5.10 - Added support for menuplan as news creation	2020-08-07 10:58:50 +02:00
Anders	e0b998dec0	Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/UserEventController.php	2020-08-07 10:52:25 +02:00
Anders	a23337b9d4	v0.5.9 - Fixed en/dk messages + added backend en/dk messages	2020-08-07 10:51:10 +02:00
frederikpyt	c02c1aacd3	v0.5.8b - Fix	2020-08-07 10:36:08 +02:00
frederikpyt	f7941841fe	v0.5.8a - Fix	2020-08-07 10:25:46 +02:00
frederikpyt	4c2b58f33b	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/resources/views/admin/events/create.blade.php	2020-08-07 09:49:31 +02:00
frederikpyt	246004ebfd	v0.5.8 - Added create news option on guide and event create/edit	2020-08-07 09:47:23 +02:00
Neerholt	b5fb505eaa	Merge pull request #3 from sebathefox/Multi-language ... v.0.5.8 - Multi language	2020-08-07 08:53:29 +02:00
Neerholt	60391793fc	v0.5.7b - Added middelware	2020-08-07 08:52:01 +02:00
Neerholt	e5e057a51a	v0.5.7a - Added middelware	2020-08-07 08:51:05 +02:00
Anders	76e3638706	v0.5.6b - Added error messages when loggin in with wrong credentials, when changing password and when logging out - Admin & User	2020-08-07 08:35:23 +02:00
Neerholt	7cc871ae90	v0.5.7 - Made multi language option	2020-08-06 15:31:38 +02:00
Anders	1b7738fd09	Merge remote-tracking branch 'origin/master'	2020-08-06 14:47:28 +02:00
Anders	708313a4b3	v0.5.6 - Fixed Guide when destroying. ... Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor	2020-08-06 14:47:22 +02:00
frederikpyt	4c2fc5f5f0	v0.5.5A - Small fixes	2020-08-06 13:35:07 +02:00
frederikpyt	3e4e6e71ab	v0.5.5 - Added news on the admin panel	2020-08-06 12:21:19 +02:00
frederikpyt	4b0ad949ba	v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations.	2020-08-06 10:32:34 +02:00
frederikpyt	358e47b703	v0.5.3A - Added permission requirements to GuideController.php	2020-08-06 08:44:21 +02:00
frederikpyt	f4a277185d	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-08-06 08:37:28 +02:00
frederikpyt	5452711665	v0.5.3 - Added Locations and a location_id to washing machines	2020-08-06 08:37:16 +02:00
Neerholt	a04c38636b	v0.5.2 - Made the new menuplan, so you now can use CKeditor.	2020-08-05 14:59:41 +02:00
frederikpyt	76bea82eea	v0.5.1 - Made contact phone number optional and updated data in seeders.	2020-08-05 13:29:45 +02:00
Anders	02b6684030	Added - Deleting Washing Reservations when deleting a washing machine	2020-08-05 10:11:28 +02:00
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	ee3caae76a	Fixes	2020-08-05 09:15:50 +02:00
frederikpyt	072c5c65ab	Fixes and todo's	2020-08-05 08:10:38 +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	d15f406059	Fail message when making a reservation with taken machine and time	2020-08-04 15:09:10 +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
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	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	f551d4c59f	Changed session messages on fail or success	2020-08-04 08:04:54 +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
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	11e3958f0a	Added - orderBy to own events & own reservations ... Fixed - confirm message when deleting events	2020-08-03 11:17:36 +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	09fa8ce007	Fixed permissions	2020-08-03 09:39:32 +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	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	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	264c44529a	Updated Seeders	2020-07-30 14:38:32 +02:00
Neerholt	7830e31b21	Roles are now searchable	2020-07-30 11:02:41 +02:00
frederikpyt	cf4559874a	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-07-30 10:12:00 +02:00
Neerholt	62d73d0894	Vaskemaskine search er kogt	2020-07-30 09:17:27 +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	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	9a1ca59e5b	Permission fixes	2020-07-29 12:30:05 +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
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	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