ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 117 Branches 1,511 Tags
Commit Graph

316 Commits

Author SHA1 Message Date
Wolfgang Huß
e8d21147ae Split 'locationAndBadgesFragment' into 'locationFragment' and 'badgesFragment' 2023-01-12 10:53:43 +01:00
Wolfgang Huß
04810ca500 Move the admins user query GQL to the appropriate file 2023-01-12 10:50:44 +01:00
Wolfgang Huß
13f2451e02 Change default GQL 'UserQuery' to named 'profileUserQuery' 2023-01-12 10:12:32 +01:00
Wolfgang Huß
6d8149a77c Implement user location on map 
- Deactivate map translation because it doesn't work.
 2023-01-11 16:18:50 +01:00
Wolfgang Huß
9790eb1f88 Make 'followedByCount' and 'followingCount' in 'User' query imperative 2023-01-11 16:17:34 +01:00
ogerly
bf87033b33 Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu 2022-10-28 13:44:47 +02:00
Moriz Wahl
831cb20952
Merge pull request #5583 from Ocelot-Social-Community/update-group-avatar-on-upload 
fix: 🍰 Update Group Avatar After Upload
 2022-10-27 14:51:33 +02:00
ogerly
baaa61761d change width, oderBy slug_asc 2022-10-27 11:40:22 +02:00
Moriz Wahl
594477f7bf fix: Update Group Avatar after Upload 2022-10-26 17:42:57 +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
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
c17bdea4c4
Update webapp/graphql/Fragments.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:54: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
d1b05b7e02 add groups to search result page 2022-10-21 18:35:21 +02:00
Moriz Wahl
add85ef49c add graphql for group search 2022-10-21 17:52:06 +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
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
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
a8cf6acd93 add slug user to group member 2022-10-18 13:38:05 +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
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ß
7b9b253211 Implement post creation in a group 2022-10-07 11:32:04 +02:00
Wolfgang Huß
c2f7604918 Fix 'groupQuery' GQL on group edit page 
- Fix links 'group/my-groups' to 'my-groups'.
- Fix 'createGroupMutation' to be used as a function on group create page.
 2022-09-18 19:44:50 +02:00
Wolfgang Huß
bba4ca0fc6 Test 'descriptionExcerpt' in all relevant group resolvers 2022-09-18 19:18:44 +02:00
Wolfgang Huß
6f6dc4e7fd Refactor 'groupMembersQuery' to a function that returns GQL 
- Toast some Apollo GQL error messages
 2022-09-18 17:51:26 +02:00
Wolfgang Huß
a85085ca74 Refactor 'changeGroupMemberRoleMutation', 'groupQuery' to a function that returns GQL 2022-09-18 17:35:08 +02:00
Wolfgang Huß
14824c8b33 Refactor 'leaveGroupMutation' to a function that returns GQL 2022-09-18 17:15:29 +02:00
Wolfgang Huß
1c040e1549 Refactor 'joinGroupMutation' to a function that returns GQL 2022-09-18 14:07:38 +02:00
Wolfgang Huß
6df10e5588 Refactor 'updateGroupMutation' to a function that returns GQL 
- Add and refactor some tests for the user resolvers.
- Refactor minor in general.
 2022-09-18 08:35:31 +02:00
Wolfgang Huß
7d9e42806c Refactor 'createGroupMutation' to a function that returns GQL 2022-09-18 07:07:11 +02:00
Wolfgang Huß
0048486a78 Refactor to save location in db by 'UpdateUser', 'CreateGroup', and 'UpdateGroup' resolvers 
- Refactor, add, and refine tests of location for 'CreateGroup' and 'UpdateGroup' resolvers.
 2022-09-17 20:55:43 +02:00
Wolfgang Huß
a4575f3ad0 Implement 'location' on group profile 2022-09-17 01:00:50 +02:00
Wolfgang Huß
57f7a43d09 Test locations in group resolvers 2022-09-16 21:09:45 +02:00
Wolfgang Huß
d32c137cff Implement 'locationName', 'location' in 'CreateGroup', 'UpdateGroup', and 'Group' resolvers 2022-09-16 07:40:33 +02:00
Wolfgang Huß
b23f4ea47b Implement descriptionExcerpt on group profile 2022-09-15 09:55:51 +02:00
Wolfgang Huß
6af9e0cec0 Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2022-09-14 16:18:37 +02:00
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
Wolfgang Huß
6a9c040722 Implement 'LeaveGroup' resolver 2022-09-13 20:23:34 +02:00
Wolfgang Huß
ee026a3e15 Remove unused parameters in 'GroupMembers' query 2022-09-10 13:16:34 +02:00
Wolfgang Huß
5eabdf1495 Comment out unimplemented parameters in 'Group' resolver 2022-09-10 07:46:08 +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
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
d4c338e04e add save categories mutation 2022-09-06 18:50:33 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
Wolfgang Huß
6280fa99cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-08-29 11:28:50 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00