4394 Commits

Author	SHA1	Message	Date
Wolfgang Huß	2e50e616a7	Merge pull request #5502 from Ocelot-Social-Community/5059-groups/5501-add-group-link-to-posts-in-webapp	2022-10-22 11:13:25 +02:00
Wolfgang Huß	1421973a9f	Fix Cypress test 'I_click_on_the_author.js'	2022-10-22 08:41:27 +02:00
Moriz Wahl	3fb4146d62	Merge branch 'master' into 5059-epic-groups	2022-10-21 16:58:32 +02:00
Wolfgang Huß	9773a7b4ba	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp	2022-10-21 11:34:31 +02:00
Wolfgang Huß	46e4d1d945	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups	2022-10-21 11:30:41 +02:00
Wolfgang Huß	937954b6f6	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups ... # Conflicts: # webapp/layouts/default.vue	2022-10-21 11:23:27 +02:00
Wolfgang Huß	1d9c24db24	Fix tests of group profile page	2022-10-21 11:12:32 +02:00
Wolfgang Huß	4f2ea8ef3c	Refine and synchronize group slug on group profile with user slug on user profile	2022-10-21 11:12:05 +02:00
Wolfgang Huß	294da3048f	Refine 'in' text between user slug and group slug in user teaser	2022-10-21 11:11:03 +02:00
Wolfgang Huß	daea147772	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5523-make-click-on-logo-configurable ... # Conflicts: # webapp/layouts/default.vue	2022-10-21 10:40:56 +02:00
Alexander Friedland	e68952b17e	Merge pull request #5512 from Ocelot-Social-Community/5384-Group-Invitation ... feat: 🍰 Group Invitation	2022-10-21 06:54:50 +02:00
ogerly	de33b2288d	fix lint	2022-10-20 16:01:16 +02:00
ogerly	af5447e830	coverage 65.14%, add specs GroupList.spec, GroupMember.spec	2022-10-20 15:58:34 +02:00
Ulf Gebhardt	56850f7790	include in between user and group link -> @user in &group	2022-10-20 12:54:07 +02:00
Ulf Gebhardt	759ec89731	corrected & for groups instead of @	2022-10-20 12:37:47 +02:00
Wolfgang Huß	0158850793	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5385-webapp-post-in-group	2022-10-20 07:44:49 +02:00
Wolfgang Huß	d2238269d1	Merge branch '5059-groups/5385-webapp-post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp	2022-10-19 19:15:40 +02:00
Wolfgang Huß	25c1c7ff90	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups	2022-10-19 19:01:01 +02:00
Wolfgang Huß	08463405cf	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp	2022-10-19 19:00:37 +02:00
Wolfgang Huß	fc32a5f1aa	Add new user teaser options to storybook	2022-10-19 18:59:26 +02:00
Wolfgang Huß	d1585bf23c	Add group to user teaser on post teaser at user and group profile	2022-10-19 18:58:43 +02:00
Moriz Wahl	43bf1ae79d	refactor: Category Filter in Filter Menu	2022-10-19 13:44:17 +02:00
Wolfgang Huß	2eb5995116	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp	2022-10-19 13:36:46 +02:00
Wolfgang Huß	b0838d9bf6	Cleanup	2022-10-19 13:29:17 +02:00
Wolfgang Huß	419ac06d9c	Implement 'LOGO_HEADER_CLICK' as configuration	2022-10-19 12:57:21 +02:00
Moriz Wahl	89e1de0f14	mock route query group id	2022-10-19 09:28:15 +02:00
Moriz Wahl	7b69a4dc3f	deactivate deprecated test	2022-10-19 09:24:08 +02:00
Moriz Wahl	25001ce6ab	mock route params	2022-10-19 09:21:08 +02:00
Moriz Wahl	61ae38065c	add callback for data object to Wrapper function	2022-10-19 09:14:42 +02:00
Moriz Wahl	78f03daf42	add groupId to variables in spec	2022-10-19 09:14:17 +02:00
ogerly	79644cb60a	add locals for group member	2022-10-18 19:29:48 +02:00
Wolfgang Huß	490c7bf2bf	Refine logic of location	2022-10-18 19:12:01 +02:00
Wolfgang Huß	ab6b5ad219	Fix 'ds-chip' 'color' error	2022-10-18 18:28:52 +02:00
Wolfgang Huß	4521c71718	Fix location bugs	2022-10-18 18:14:38 +02:00
ogerly	3c4d4bb8eb	style flex find user per slug	2022-10-18 14:43:29 +02:00
ogerly	548dcaaf6e	dynamic load by add new group member per slug	2022-10-18 14:23:14 +02:00
ogerly	a8cf6acd93	add slug user to group member	2022-10-18 13:38:05 +02:00
ogerly	2755ca6562	change location in group update	2022-10-18 09:54:45 +02:00
Wolfgang Huß	731f3a51aa	Add group to user teaser, on post page, and on news feed	2022-10-17 18:45:02 +02:00
ogerly	11f5ce746a	search input for invite user in group	2022-10-17 16:47:37 +02:00
ogerly	1a273918b5	remove console statments, fix lint	2022-10-17 12:07:27 +02:00
ogerly	9baabd0737	change sameLocation and delete Location Button position	2022-10-17 12:05:35 +02:00
ogerly	fc75d4f370	rename computed disableButtomByUpdate to disableButtonByUpdate	2022-10-16 13:03:10 +02:00
ogerly	018cfc68b1	check groupForm disableButton if creat and update	2022-10-16 12:58:00 +02:00
Wolfgang Huß	95cb82da34	Make configurable header menu translatable	2022-10-15 16:11:28 +02:00
Alexander Friedland	356627a257	Merge pull request #5418 from Ocelot-Social-Community/5397-Refine-Group-Creation-And-Group-Edit ... feat: 🍰 Refine Group Creation And Group Edit	2022-10-10 08:16:31 +02:00
Wolfgang Huß	42f5df78e4	Cleanup	2022-10-07 23:34:43 +02:00
Wolfgang Huß	1703638dd6	Implement group indication headline for view and edit post page	2022-10-07 23:26:47 +02:00
Wolfgang Huß	fc4e67990b	Implement visibility of posts on group profile	2022-10-07 13:14:12 +02:00
Wolfgang Huß	7b9b253211	Implement post creation in a group	2022-10-07 11:32:04 +02:00