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

1511 Commits

Author SHA1 Message Date
Wolfgang Huß
be9dbdbb76 Refine component 'my-social-media' in webapp 2022-10-04 11:04:50 +02:00
Wolfgang Huß
a5c65faf15 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 
# Conflicts:
#	webapp/pages/settings/my-social-media.vue
 2022-10-04 10:08:29 +02:00
ogerly
90b64dc0f3 resolve review fix 2022-09-30 10:49:54 +02:00
Wolfgang Huß
5a9d9f9da8 Fix tests in webapp 2022-09-28 19:00:13 +02:00
Wolfgang Huß
f534d1cd40 Move component 'GroupContentMenu' to folder 'ContentMenu' 2022-09-28 16:42:22 +02:00
Wolfgang Huß
ac9be9e2a3 Refactor 'GroupContentMenu' component 2022-09-28 16:38:56 +02:00
Wolfgang Huß
178c64a49d Merge branch '5344-add-group-members-management' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-implement-content-menu-group-profile 
# Conflicts:
#	webapp/components/Group/GroupContentMenu.vue
 2022-09-28 12:19:29 +02:00
Wolfgang Huß
0d8ce0a172 Cleanup 2022-09-28 12:04:34 +02:00
Wolfgang Huß
1e01ccfa71 Add 'GroupContentMenu' on group profile page 2022-09-28 12:02:41 +02:00
Wolfgang Huß
211a4b9130 Fix webapp tests 2022-09-26 11:52:09 +02:00
Wolfgang Huß
0d44d8ae04 Cleanup 
- Reduce tooltip delay to 750ms.
 2022-09-26 11:42:44 +02:00
Wolfgang Huß
7b11122bea Refine design and functionality of group list and create, edit group 2022-09-26 10:31:00 +02:00
Wolfgang Huß
e5acca7329 Use Vue Apollo automatic fetching in 'members.vue' 2022-09-25 13:23:21 +02:00
Wolfgang Huß
023ee74633 Cleanup 2022-09-25 13:22:24 +02:00
Wolfgang Huß
41af877ab5 Refine functionality, second step 2022-09-25 13:22:07 +02:00
Wolfgang Huß
5392da0983 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-24 18:18:20 +02:00
Wolfgang Huß
13ec4ee776 Refine design and a bit functionality, first step 2022-09-24 18:06:15 +02:00
Wolfgang Huß
2aa85d7b05 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5344-add-group-members-management 
# Conflicts:
#	backend/src/db/graphql/groups.js
#	backend/src/schema/resolvers/groups.js
#	webapp/components/Group/GroupCard.vue
#	webapp/components/Group/GroupForm.vue
#	webapp/components/Group/GroupTeaser.vue
#	webapp/graphql/groups.js
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/group/edit/_id.vue
 2022-09-23 15:04:49 +02:00
ogerly
beebcdbee7 Merge branch 'master' into 5344-add-group-members-management 2022-09-23 10:47:08 +02:00
ogerly
f1427b2528 fix lint 2022-09-23 10:45:38 +02:00
ogerly
3e1eb299b7 pull && resolve conflicts 2022-09-23 10:41:49 +02:00
ogerly
69620ca8d7 fix reviews 2022-09-23 10:38:21 +02:00
Alexander Friedland
22f5c90a21
Update webapp/pages/group/edit/_id/members.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:00:07 +02:00
Alexander Friedland
4c55ca731e
Update webapp/pages/my-groups.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 08:59:45 +02:00
Wolfgang Huß
c47aef09f5 Cleanup 2022-09-21 08:02:58 +02:00
Wolfgang Huß
66fe131f70 Test group profile page, the end 2022-09-20 17:10:45 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00
Wolfgang Huß
25c26ce158 test group profile page, a start 2022-09-20 13:03:00 +02:00
Wolfgang Huß
ad349e4ecd Fix warning "Invalid component name: …" of 'webapp/pages/terms-and-conditions-confirm.vue' 2022-09-20 06:22:19 +02:00
Alexander Friedland
e4c3600ad6
Merge branch '5059-epic-groups' into 5344-add-group-members-management 2022-09-19 18:55:44 +02:00
ogerly
57a6e74d10 fix lint and locales 2022-09-19 18:50:53 +02:00
ogerly
7d5205e08b translation of the texts 2022-09-19 18:27:41 +02:00
Wolfgang Huß
5d0eecfc75 Cleanup 2022-09-19 07:42:51 +02:00
Wolfgang Huß
29be8ee49a Fix update of members list if current user is not allowed to see it anymore 2022-09-19 07:39:37 +02:00
Wolfgang Huß
83bfbd863c Manage seeing group members on group profile 2022-09-19 06:27:41 +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ß
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ß
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ß
a4575f3ad0 Implement 'location' on group profile 2022-09-17 01:00:50 +02:00
Wolfgang Huß
9396a61ec0 Implement 'categories' on group profile 2022-09-16 07:23:40 +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ß
b26c500bd0 Implement 'categories' on group profile, next step 2022-09-16 07:14:56 +02:00
Wolfgang Huß
1d3fc9b88a Set tooltip on post page categories 2022-09-16 07:08:32 +02:00
Wolfgang Huß
7f397b4669 Set Vue tooltip delay to 1500 ms and remove unneeded properties 2022-09-16 07:05:21 +02:00
Wolfgang Huß
4f68d9c7c3 Implement 'categories' on group profile, first step 2022-09-16 05:25:31 +02:00
Wolfgang Huß
e570d0773a Remove unneeded eslint-enable 2022-09-16 05:25:00 +02:00
Wolfgang Huß
912980c6e6 Implement 'description', 'descriptionExcerpt', and collapse on group profile 2022-09-15 18:28:13 +02:00
ogerly
a5e0794ec8 style in groupList for locationName and radius 2022-09-15 13:13:51 +02:00
ogerly
bc8cba13b3 add location and location name for group 2022-09-15 12:38:59 +02:00
Wolfgang Huß
b5e181c6a1 Fix undefined locales for group properties on group profile 2022-09-15 10:05:08 +02:00