11943 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	6fa1ad3360	Merge pull request #5574 from Ocelot-Social-Community/5573-release-v2.1.0-groups ... chore: 🍰 Release v2.1.0	2022-10-25 16:32:44 +02:00
Wolfgang Huß	dc085e9e69	Release v2.1.0	2022-10-25 14:24:10 +02:00
Wolfgang Huß	56fcd26649	Merge pull request #5132 from Ocelot-Social-Community/5059-epic-groups ... feat: 🍰 EPIC Groups	2022-10-25 14:16:59 +02:00
Wolfgang Huß	5b922921fc	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups	2022-10-25 13:33:58 +02:00
Wolfgang Huß	b9488d7d7a	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups	2022-10-25 13:33:11 +02:00
Wolfgang Huß	0aa4172a44	Merge pull request #5552 from Ocelot-Social-Community/5059-groups/5551-remove-groups-separate-auto-deployment ... chore: 🍰 Remove Group Branchs `5059-epic-groups` Separate Auto-Deployment	2022-10-25 12:19:42 +02:00
Susmit Mukherjee	9928e4aaf3	Merge pull request #5559 from Ocelot-Social-Community/branchissue#5427 ... fix: [WIP] 🍰 Long Words Are Being Wrapped Now	2022-10-25 01:35:41 +05:30
Susmit Mukherjee	917c20c7c7	Addressed issue #5427,Long words are being wrapped now	2022-10-23 22:14:18 +05:30
Wolfgang Huß	ef06f1a67d	Add database migration to auto-deployment on publish	2022-10-23 18:30:53 +02:00
Wolfgang Huß	04c8da6a6c	Change commented publishing branch and add commented template branch for separate auto deployment	2022-10-23 17:48:48 +02:00
Wolfgang Huß	c8d816887b	Remove groups separate auto-deployment	2022-10-23 17:46:22 +02:00
Wolfgang Huß	ab6a4f46e3	Release v2.0.0	2022-10-23 14:37:14 +02:00
Wolfgang Huß	717b36b60c	Merge pull request #5543 from Ocelot-Social-Community/search-groups ... feat: 🍰 Search For Groups	2022-10-23 14:25:42 +02:00
Wolfgang Huß	02d25c4bc7	Restore 'groupName: name' in 'searchGroups' GQL to have back the group name on the group teaser in the search results	2022-10-23 13:41:41 +02:00
Moriz Wahl	88b5fb9b46	have i18n as option for search groups, fix test	2022-10-23 13:02:04 +02:00
Moriz Wahl	e27f9b00e6	remove location from group fragment, remove search type from search string on search page	2022-10-23 01:18:58 +02:00
Moriz Wahl	fc605a6d66	remove blank line	2022-10-23 01:17:33 +02:00
Moriz Wahl	c17bdea4c4	Update webapp/graphql/Fragments.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-23 00:54:48 +02:00
Moriz Wahl	9cffe4f275	Update webapp/components/generic/SearchGroup/SearchGroup.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-23 00:53:56 +02:00
Moriz Wahl	7102de6e52	Update webapp/components/generic/SearchGroup/SearchGroup.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-23 00:53:41 +02:00
Moriz Wahl	19aa01f83f	Update webapp/components/generic/SearchGroup/SearchGroup.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-23 00:53:22 +02:00
Moriz Wahl	6f4bde93f6	Update backend/src/schema/resolvers/searches.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-23 00:52:48 +02:00
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
Moriz Wahl	c2617af23f	add db:migrate up to CI	2022-10-22 15:28:01 +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
ogerly	15561cb94f	fix lint	2022-10-22 09:36:18 +02:00
ogerly	401f59ae8d	add header menu to component, central variabl for screen width	2022-10-22 09:35:27 +02:00
Wolfgang Huß	1421973a9f	Fix Cypress test 'I_click_on_the_author.js'	2022-10-22 08:41:27 +02:00
ogerly	1406361cf0	change pixel mobile menu show by under 811px	2022-10-22 08:33:30 +02:00
Wolfgang Huß	23dbab9427	Merge pull request #5524 from Ocelot-Social-Community/4732-Put-Footer-Content-In-The-Menu-On-Mobil-Phones ... feat: 🍰 Mobile Footer Menu To Header Menu	2022-10-22 08:15:00 +02:00
Moriz Wahl	d1b05b7e02	add groups to search result page	2022-10-21 18:35:21 +02:00
Moriz Wahl	57bbe4c6e8	allow search groups in permission middleware, add user id to search groups query	2022-10-21 18:34:48 +02:00
Moriz Wahl	2b8b50af48	add group hint to search hint	2022-10-21 17:59:11 +02:00
Moriz Wahl	61c2250c03	respect & symbol in searches	2022-10-21 17:54:25 +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	37babb5c7c	Merge branch '5059-epic-groups' into search-groups	2022-10-21 16:59:13 +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ß	1f6b1f8710	Merge pull request #5525 from Ocelot-Social-Community/5523-make-click-on-logo-configurable ... feat: 🍰 Implement `LOGO_HEADER_CLICK` As Configuration	2022-10-21 11:39:51 +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