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
13,105 Commits 117 Branches 1,511 Tags
Commit Graph

338 Commits

Author SHA1 Message Date
Moriz Wahl
65ad2a72ad postType not in fragment 2023-04-25 15:09:36 +02:00
ogerly
affc392b10 teasr 2023-04-25 14:05:17 +02:00
ogerly
e172fe917a fix lint 2023-04-24 14:20:36 +02:00
ogerly
1ba79343fe save event 2023-04-24 12:40:52 +02:00
Moriz Wahl
033630e8e3 add group type for mark notifications as read 2023-03-16 16:55:30 +01:00
Moriz Wahl
ab58c569d0 related user for group notifications 2023-03-15 17:49:52 +01:00
Moriz Wahl
10c02c251e group notifications in notification dropdown 2023-03-15 16:23:45 +01:00
Moriz Wahl
5bd831752d
Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-09 13:23:09 +01:00
Moriz Wahl
bdc1cb33da Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-08 16:50:02 +01:00
Moriz Wahl
6a84a02027 add remove user from group mutation 2023-03-03 17:46:20 +01:00
Moriz Wahl
b8228db9f3 Merge branch 'master' into map 2023-02-03 17:41:12 +01:00
Wolfgang Huß
54e7de30da Cleanup 2023-01-25 17:25:12 +01:00
Wolfgang Huß
654bf0f64e Add 'about' to 'mapUserQuery' 2023-01-25 17:24:55 +01:00
Wolfgang Huß
04f43cde71 Comment use of GQL 'location' fragment in webapp 'groups' file 2023-01-12 15:44:06 +01:00
Wolfgang Huß
844bfb4cfb Show all groups with locations on map 2023-01-12 13:20:46 +01:00
Wolfgang Huß
36239bc762 Show all users with locations on map 2023-01-12 11:25:58 +01:00
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
Wolfgang Huß
02598e5224 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 2022-11-23 14:34:23 +01:00
Wolfgang Huß
dd80dc764c Fix unused parameters naming 2022-11-16 14:13:32 +01:00
Wolfgang Huß
b398eabf47 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read 
# Conflicts:
#	webapp/locales/it.json
 2022-11-16 11:45:19 +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ß
be9dbdbb76 Refine component 'my-social-media' in webapp 2022-10-04 11:04:50 +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