11399 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	210aebb829	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second	2022-09-14 14:27:01 +02:00
Moriz Wahl	922ca2d7ef	Merge pull request #5284 from Ocelot-Social-Community/save-categories-in-frontend ... feat: 🍰 Save Categories In Frontend	2022-09-12 15:08:09 +02:00
Moriz Wahl	53a58fb284	Merge pull request #5319 from Ocelot-Social-Community/add-new-yunite-icons ... feat: 🍰 Add New Yunite Icons	2022-09-12 15:07:45 +02:00
Wolfgang Huß	1bc607ec28	Merge pull request #5334 from Ocelot-Social-Community/5333-update-neode ... chore: 🍰 Update Neode From v^0.4.7 To v^0.4.8 In Backend	2022-09-12 09:27:45 +02:00
Wolfgang Huß	5b1643208b	Upgrade neode from v^0.4.7 to v^0.4.8 in backend and main folder	2022-09-10 12:36:49 +02:00
Wolfgang Huß	5eabdf1495	Comment out unimplemented parameters in 'Group' resolver	2022-09-10 07:46:08 +02:00
Wolfgang Huß	97963a96bf	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second	2022-09-09 13:54:42 +02:00
Wolfgang Huß	af26b8605c	Show page not found error if there is no 'id' and no 'slug' in a persistent link	2022-09-09 13:49:16 +02:00
Wolfgang Huß	36f6fee8be	Query groups by 'Group' resolver via 'slug' and test it	2022-09-09 13:44:13 +02:00
Moriz Wahl	8e561711d0	fix typo	2022-09-08 16:37:41 +02:00
Moriz Wahl	3508b37224	load new icons for categories	2022-09-08 16:28:45 +02:00
Moriz Wahl	bb0d6329e7	add new yunite icons	2022-09-08 16:25:18 +02:00
Wolfgang Huß	d87c0271a1	Merge pull request #5317 from Ocelot-Social-Community/5059-groups/5316-in-be-hidden-groups-not-listed-for-none-or-pending-members ... feat: 🍰 Hidden Groups Shall Not Be Visible For None Or Pending Members In Backend	2022-09-08 15:42:18 +02:00
Moriz Wahl	60627ffcf2	ensure that selected categories are resteted before toggling them to set saved categories	2022-09-08 15:34:29 +02:00
Moriz Wahl	2c4f45ad70	Update webapp/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-08 15:17:12 +02:00
Moriz Wahl	cc5fcb6704	Update webapp/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-08 15:17:05 +02:00
Wolfgang Huß	b3a0d88a46	Merge branch '5059-groups/5316-in-be-hidden-groups-not-listed-for-none-or-pending-members' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second	2022-09-08 13:33:42 +02:00
Wolfgang Huß	89920f387a	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups ... # Conflicts: # backend/src/schema/types/type/User.gql	2022-09-08 13:29:29 +02:00
Wolfgang Huß	6879b1112c	Refine tests of 'Group' resolver	2022-09-08 13:11:55 +02:00
Wolfgang Huß	00ccf5ed9a	Implement and test to find no hidden groups by 'Group' resolver where user is none or 'pending' member	2022-09-08 12:55:16 +02:00
Wolfgang Huß	0f9cc6864e	Merge pull request #5197 from Ocelot-Social-Community/5059-groups/5190-group-profile ... feat: 🍰 Implement Group Profile	2022-09-08 10:59:51 +02:00
Wolfgang Huß	dcf9a91ffc	Fix groups seeding	2022-09-08 09:06:18 +02:00
Moriz Wahl	754251258d	test setting of saved categories	2022-09-07 21:50:37 +02:00
Moriz Wahl	b323d0f580	set category filter as stored in db after login	2022-09-07 20:19:10 +02:00
Moriz Wahl	a65e306b85	all categories saved returns empty array	2022-09-07 16:04:09 +02:00
Moriz Wahl	32e7c8971c	Merge branch 'master' into save-categories-in-frontend	2022-09-07 15:14:03 +02:00
Moriz Wahl	5596cd11e9	test saving active categories	2022-09-07 15:13:14 +02:00
Moriz Wahl	860949dc6a	test current user query for active categories	2022-09-07 15:00:04 +02:00
Moriz Wahl	bcaeee44fa	adopt active categories as array of ids	2022-09-07 14:12:53 +02:00
Moriz Wahl	18e15be24d	active categories is array of string (ids of categories), current user query resolves with active categories	2022-09-07 14:09:24 +02:00
Moriz Wahl	d05919fddb	add active categories to current user query	2022-09-07 14:08:03 +02:00
Moriz Wahl	341e386207	linting	2022-09-07 13:37:48 +02:00
Moriz Wahl	01dd0dc038	Merge pull request #5301 from Ocelot-Social-Community/fix-category-filter-menu ... fix: Category Filter Menu Client Only	2022-09-07 12:57:45 +02:00
Wolfgang Huß	99b1a164a8	Remove testing of group profile for now	2022-09-07 12:29:17 +02:00
Wolfgang Huß	ee770aa204	Cleanup	2022-09-07 12:25:08 +02:00
Wolfgang Huß	fa79c25e9b	Implement join button on Group profile, a start	2022-09-07 11:12:34 +02:00
Moriz Wahl	f5d8014f6c	fix: Category Filter Menu Client Only	2022-09-07 11:06:43 +02:00
Moriz Wahl	14d9399b20	Merge branch 'master' into save-categories-in-frontend	2022-09-07 09:16:45 +02:00
Moriz Wahl	1c2a2a05fe	Merge pull request #5261 from Ocelot-Social-Community/save-category-settings ... feat: Save Category Settings	2022-09-07 09:14:58 +02:00
Wolfgang Huß	d11b512bfb	Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile	2022-09-07 08:32:05 +02:00
Wolfgang Huß	705ab9a0a3	Merge pull request #5224 from Ocelot-Social-Community/5059-groups/5131-implement-update-group-resolver ... feat: 🍰 Implement `UpdateGroup` Resolver	2022-09-06 19:51:43 +02:00
Moriz Wahl	3213bd3ee4	test save categories	2022-09-06 19:17:06 +02:00
Moriz Wahl	dcdef615c1	add locales for saving categories	2022-09-06 18:51:55 +02:00
Moriz Wahl	d45ad17b43	add save button to category filters	2022-09-06 18:51:20 +02:00
Moriz Wahl	d4c338e04e	add save categories mutation	2022-09-06 18:50:33 +02:00
Moriz Wahl	523d290ff8	add save icon	2022-09-06 18:50:05 +02:00
Moriz Wahl	ab662db0e4	empty array as input only clears all saved categories	2022-09-06 18:46:47 +02:00
Moriz Wahl	b262b16cf2	Merge branch 'save-category-settings'	2022-09-06 17:42:12 +02:00
Moriz Wahl	8a688ca78b	improve tests	2022-09-06 15:14:31 +02:00
Moriz Wahl	60fabe587b	Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu ... feat: Topics Menu	2022-09-06 13:28:15 +02:00