Moriz Wahl
|
b969630e6e
|
Merge branch 'master' into notifications-remove-user-from-group
|
2023-03-17 13:31:03 +01:00 |
|
Moriz Wahl
|
49288750cf
|
try fixing join group button
|
2023-03-17 11:10:23 +01:00 |
|
mahula
|
f38cf84288
|
add mode forpending user to join leave button
|
2023-03-13 17:02:37 +01:00 |
|
Wolfgang Huß
|
e719ae23c9
|
Adjust ds-chips background color on group teaser and group profile
|
2023-03-01 07:55:50 +01:00 |
|
Moriz Wahl
|
4850e456fe
|
pages tests nearly working
|
2023-02-13 23:08:41 +01:00 |
|
Moriz Wahl
|
b2be8a301e
|
first pages test working
|
2023-02-13 20:29:16 +01:00 |
|
Moriz Wahl
|
e2ac3ba846
|
sort categories on group profile
|
2022-11-28 14:02:37 +01:00 |
|
Moriz Wahl
|
0d160c0280
|
add modal to add group member confrimation
|
2022-11-22 12:24:02 +01:00 |
|
Moriz Wahl
|
3bf26de650
|
rename route from my-groups to groups
|
2022-10-26 14:18:33 +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 |
|
Wolfgang Huß
|
1d9c24db24
|
Fix tests of group profile page
|
2022-10-21 11:12:32 +02:00 |
|
Wolfgang Huß
|
4f2ea8ef3c
|
Refine and synchronize group slug on group profile with user slug on user profile
|
2022-10-21 11:12:05 +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 |
|
|
|
759ec89731
|
corrected & for groups instead of @
|
2022-10-20 12:37:47 +02:00 |
|
Wolfgang Huß
|
0158850793
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5385-webapp-post-in-group
|
2022-10-20 07:44:49 +02:00 |
|
Wolfgang Huß
|
d2238269d1
|
Merge branch '5059-groups/5385-webapp-post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp
|
2022-10-19 19:15:40 +02:00 |
|
Wolfgang Huß
|
2eb5995116
|
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-19 13:36:46 +02:00 |
|
Moriz Wahl
|
61ae38065c
|
add callback for data object to Wrapper function
|
2022-10-19 09:14:42 +02:00 |
|
ogerly
|
79644cb60a
|
add locals for group member
|
2022-10-18 19:29:48 +02:00 |
|
ogerly
|
548dcaaf6e
|
dynamic load by add new group member per slug
|
2022-10-18 14:23:14 +02:00 |
|
Alexander Friedland
|
356627a257
|
Merge pull request #5418 from Ocelot-Social-Community/5397-Refine-Group-Creation-And-Group-Edit
feat: 🍰 Refine Group Creation And Group Edit
|
2022-10-10 08:16:31 +02:00 |
|
Wolfgang Huß
|
fc4e67990b
|
Implement visibility of posts on group profile
|
2022-10-07 13:14:12 +02:00 |
|
Wolfgang Huß
|
7b9b253211
|
Implement post creation in a group
|
2022-10-07 11:32:04 +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ß
|
41af877ab5
|
Refine functionality, second step
|
2022-09-25 13:22:07 +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
|
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 |
|
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 |
|
Wolfgang Huß
|
25c26ce158
|
test group profile page, a start
|
2022-09-20 13:03:00 +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 |
|