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

1890 Commits

Author SHA1 Message Date
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ß
bece00c1bc Set Vue tooltip delay to 1500 ms and remove unneeded properties 2022-09-16 07:22:44 +02:00
Wolfgang Huß
a48a338e26 Merge branch 'category-tooltipps' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-description-etc 
# Conflicts:
#	webapp/components/PostTeaser/PostTeaser.vue
#	webapp/pages/post/_id/_slug/index.vue
 2022-09-16 07:18:25 +02:00
Wolfgang Huß
7f397b4669 Set Vue tooltip delay to 1500 ms and remove unneeded properties 2022-09-16 07:05:21 +02:00
Moriz Wahl
64153ea9e3 change delay of category tooltip to 1500 2022-09-15 10:04:26 +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ß
2d3d559eab Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-14 14:28:09 +02:00
Wolfgang Huß
ff8f3fed7a Implement confirm modal for leaving a group 2022-09-14 14:12:06 +02:00
Wolfgang Huß
13727729a5 Refactor join/leave button function and the related events 2022-09-14 13:01:07 +02:00
Wolfgang Huß
bfef47a2a1 fix assignment to prop in 'JoinLeaveButton' 2022-09-14 08:28:56 +02:00
Wolfgang Huß
0cd3617f65 Implement working leave button on group profile 2022-09-13 20:42:08 +02:00
Moriz Wahl
5727eeb49f feature: Tooltips for Topics 2022-09-13 09:17:04 +02:00
Wolfgang Huß
330bdd4df5 Implement join/leave button on group profile 2022-09-12 20:00:48 +02:00
Wolfgang Huß
aac951e7a7 Refine profile and follow list 2022-09-12 13:23:37 +02:00
Wolfgang Huß
8e1355e5ee Change 'titleNobody' in component 'ProfileList' to not(!) required 2022-09-12 09:42:03 +02:00
Wolfgang Huß
9e544b0e64 Rename props and classes in 'ProfileList' 2022-09-12 08:35:52 +02:00
Wolfgang Huß
b7be7018e8 Move important parts of 'FollowList' to sub component 'ProfileList' 2022-09-12 08:26:10 +02:00
Wolfgang Huß
a9376cb979 Renamed folder 'FollowList' to 'ProfileList' 2022-09-12 07:32:18 +02:00
Wolfgang Huß
1796a04a9c
Update webapp/components/Group/GroupForm.vue 2022-09-10 08:57:06 +02:00
ogerly
26cf8f14d9 resolve conflicts 2022-09-09 13:18:46 +02:00
ogerly
80940ae4f5 fix lint 2022-09-09 13:06:46 +02:00
ogerly
a1da04ec05 change components add constants 2022-09-09 13:06:13 +02:00
Alexander Friedland
ad029247e7
Update webapp/components/Group/GroupForm.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-09 13:03:38 +02:00
ogerly
a5d5dd7eda import GroupMembers component in group settings 2022-09-09 12:23:51 +02:00
ogerly
3d5f29c0f1 change page structure for groupe settings 2022-09-09 12:17:48 +02:00
ogerly
46f981357f fix lint 2022-09-09 10:19:24 +02:00
ogerly
a9a2097557 Merge branch '5059-epic-groups' into 5140-My-Groups-Page 2022-09-09 10:14:46 +02:00
ogerly
e5a969b3f7 group settings add sidemenu 2022-09-08 17:05:16 +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
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
ogerly
f6de01e821 resolve conflicts 2022-09-08 12:11:50 +02:00
ogerly
fb9cf7559e fix updateGroup function 2022-09-08 11:59:54 +02:00
ogerly
fe6ad2cff3 add better seed for group myRole 2022-09-08 09:55:58 +02:00
ogerly
99d2ce9d29 update group data funktion 2022-09-08 08:35:29 +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
32e7c8971c Merge branch 'master' into save-categories-in-frontend 2022-09-07 15:14:03 +02:00
Moriz Wahl
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +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
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
ogerly
5f7b1c9094 new group mutation with correct data 2022-09-05 13:26:00 +02:00
ogerly
9715243454 Merge branch '5059-epic-groups' into 5140-My-Groups-Page 2022-09-05 11:18:57 +02:00
ogerly
bfe6605b21 list upgrade database datas 2022-09-05 11:17:31 +02:00
Wolfgang Huß
b96dfa84e0 Merge branch '5059-groups/5131-implement-update-group-resolver' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	backend/src/schema/resolvers/groups.spec.js
 2022-09-05 10:59:21 +02:00
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Wolfgang Huß
99f053205a
Merge pull request #5198 from Ocelot-Social-Community/categories-filter-menu 
feat: Categories Filter Menu
 2022-08-31 08:44:56 +02:00
Wolfgang Huß
5f43a51c6a Rename prop 'user' of 'profile-avatar' to 'profile' 2022-08-29 18:39:51 +02:00
Wolfgang Huß
615ee2991a Rename Component from 'UserAvatar' as 'user-avatar' to 'ProfileAvatar' as 'profile-avatar' 2022-08-29 18:21:50 +02:00