11818 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	20ca2eca39	change style for button position	2022-10-27 15:29:21 +02:00
ogerly	4c4e67bcf7	filter category save and all button in on line	2022-10-27 15:17:27 +02:00
ogerly	d0e298ad26	Merge branch 'Make-Header-Menu-To-Component' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-27 14:21:21 +02:00
ogerly	8c7005f643	change font-size and filter icon size	2022-10-27 12:00:08 +02:00
ogerly	baaa61761d	change width, oderBy slug_asc	2022-10-27 11:40:22 +02:00
Alexander Friedland	34839b5311	Merge branch 'master' into Make-Header-Menu-To-Component	2022-10-27 09:03:26 +02:00
Alexander Friedland	c875148229	Update webapp/layouts/default.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-27 08:56:49 +02:00
Alexander Friedland	ac8490eb95	Update webapp/layouts/default.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-27 08:56:43 +02:00
Wolfgang Huß	d4b921a25c	Merge pull request #5584 from Ocelot-Social-Community/5059-groups/5570-fix-group-teaser ... fix: 🍰 Fix Group Teaser	2022-10-27 08:10:47 +02:00
Wolfgang Huß	a69e155ef9	Fix slug indicator character '@' → '&' on the group teaser	2022-10-26 18:37:01 +02:00
Wolfgang Huß	73b91a5f04	Fix visibility of the role chip on the group teaser	2022-10-26 18:26:13 +02:00
Moriz Wahl	a6517ca0d8	Merge pull request #5582 from Ocelot-Social-Community/list-all-groups ... feat: 🍰 List All Groups	2022-10-26 18:13:23 +02:00
Moriz Wahl	1cc663ed34	add spec for groups	2022-10-26 16:05:44 +02:00
Moriz Wahl	b183485237	fix locales	2022-10-26 15:17:36 +02:00
adrianrojek	a20f1e1bc4	Merge pull request #5579 from Ocelot-Social-Community/bug/issue#5550 ... feat: 🍰 Header Logo Routing Update	2022-10-26 15:16:38 +02:00
Moriz Wahl	bbf625d525	remove comments	2022-10-26 15:15:08 +02:00
Moriz Wahl	1d21da46e0	add pagination buttons to group lists	2022-10-26 14:57:59 +02:00
Moriz Wahl	6ec8f05904	add pagination to Group query	2022-10-26 14:27:08 +02:00
Moriz Wahl	3bf26de650	rename route from my-groups to groups	2022-10-26 14:18:33 +02:00
Moriz Wahl	7f22b5fb62	add tab to group page to have all groups and my groups	2022-10-26 14:06:02 +02:00
Moriz Wahl	5b66edb387	add group count query	2022-10-26 13:49:25 +02:00
Wolfgang Huß	bdeb39edd1	Merge branch 'bug/issue#5550' of github.com:Ocelot-Social-Community/Ocelot-Social into bug/issue#5550 ... # Conflicts: # webapp/constants/logos.js	2022-10-26 11:45:04 +02:00
Wolfgang Huß	d9ed2ef2ca	Implement that undefined logo click target is '_blank' as default	2022-10-26 11:43:29 +02:00
ar798ax	1b48ef619a	lint fix	2022-10-26 11:12:37 +02:00
ar798ax	397b469f62	header logo routing update	2022-10-26 10:14:39 +02:00
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