4415 Commits

Author	SHA1	Message	Date
Wolfgang Huß	f90d671245	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into search-groups	2022-10-22 18:07:35 +02:00
Wolfgang Huß	2b0ea92f09	Fix master merge by adding groups button to mobile menu	2022-10-22 12:30:48 +02:00
Wolfgang Huß	5434bbf6c6	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups ... # Conflicts: # webapp/layouts/default.vue	2022-10-22 12:29:59 +02:00
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	d1b05b7e02	add groups to search result page	2022-10-21 18:35:21 +02:00
Moriz Wahl	2b8b50af48	add group hint to search hint	2022-10-21 17:59:11 +02:00
Moriz Wahl	522cd8ef9e	search for groups	2022-10-21 17:52:33 +02:00
Moriz Wahl	add85ef49c	add graphql for group search	2022-10-21 17:52:06 +02:00
Moriz Wahl	cb1e9f95e0	add headers for group search	2022-10-21 17:51:43 +02:00
Moriz Wahl	3fb4146d62	Merge branch 'master' into 5059-epic-groups	2022-10-21 16:58:32 +02:00
Alexander Friedland	fc7bbede1d	Update webapp/components/PageFooter/PageFooter.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-21 13:44:22 +02:00
Alexander Friedland	f399fa11a1	Merge branch 'master' into 4732-Put-Footer-Content-In-The-Menu-On-Mobil-Phones	2022-10-21 13:42:26 +02:00
ogerly	bdf848b237	set this.windowWidth, and change computed showMobileMenu	2022-10-21 12:50:13 +02:00
ogerly	b467e6846a	comment out headerMenu.js	2022-10-21 12:30:45 +02:00
ogerly	ef316d5c36	fix lint	2022-10-21 12:24:38 +02:00
ogerly	5f89017cea	mobile menu check, delete topic	2022-10-21 12:23:41 +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
ogerly	e4c3f9b729	mobile hamburger menu if 810px	2022-10-20 09:43:55 +02:00
ogerly	5257535b85	item output removed	2022-10-20 09:40:15 +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
ogerly	000352f3cd	filter menu only show on index	2022-10-19 21:22:43 +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
ogerly	3aebace584	fix lint	2022-10-19 14:24:55 +02:00
ogerly	41e0cc5d3c	dynamic header menu to mobile version	2022-10-19 14:24:04 +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
ogerly	b6fa79594c	add components PageParamsLink.vue in layouts default	2022-10-19 12:58:50 +02:00
Wolfgang Huß	419ac06d9c	Implement 'LOGO_HEADER_CLICK' as configuration	2022-10-19 12:57:21 +02:00
ogerly	5200a2c6fd	fist step mobile footer menu to heder menu	2022-10-19 12:19:47 +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