Moriz Wahl
|
b183485237
|
fix locales
|
2022-10-26 15:17:36 +02:00 |
|
Moriz Wahl
|
3bf26de650
|
rename route from my-groups to groups
|
2022-10-26 14:18:33 +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ß
|
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
|
2b8b50af48
|
add group hint to search hint
|
2022-10-21 17:59:11 +02:00 |
|
Moriz Wahl
|
cb1e9f95e0
|
add headers for group search
|
2022-10-21 17:51:43 +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 |
|
|
|
56850f7790
|
include in between user and group link -> @user in &group
|
2022-10-20 12:54:07 +02:00 |
|
ogerly
|
79644cb60a
|
add locals for group member
|
2022-10-18 19:29:48 +02:00 |
|
ogerly
|
a8cf6acd93
|
add slug user to group member
|
2022-10-18 13:38:05 +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 |
|
Alexander Friedland
|
c6fa49ee0f
|
Merge branch '5059-epic-groups' into 5344-add-group-members-management
|
2022-09-28 09:22:12 +02:00 |
|
Wolfgang Huß
|
f62df1f4aa
|
Add 'my groups' to avatar menu
|
2022-09-27 16:10:17 +02:00 |
|
Wolfgang Huß
|
0d44d8ae04
|
Cleanup
- Reduce tooltip delay to 750ms.
|
2022-09-26 11:42:44 +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
|
3e1eb299b7
|
pull && resolve conflicts
|
2022-09-23 10:41:49 +02:00 |
|
ogerly
|
12a0ca59f8
|
fix lint && locales
|
2022-09-23 10:40:00 +02:00 |
|
ogerly
|
69620ca8d7
|
fix reviews
|
2022-09-23 10:38:21 +02:00 |
|
Alexander Friedland
|
3d6c5e6f62
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:13:05 +02:00 |
|
Alexander Friedland
|
4753630418
|
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:49 +02:00 |
|
ogerly
|
17891c93ae
|
fix locales lint
|
2022-09-20 08:50:48 +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ß
|
83bfbd863c
|
Manage seeing group members on group profile
|
2022-09-19 06:27:41 +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ß
|
4f68d9c7c3
|
Implement 'categories' on group profile, first step
|
2022-09-16 05:25:31 +02:00 |
|
Moriz Wahl
|
ba9a6fd750
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-15 09:25:46 +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ß
|
e04bfe7484
|
Implement displaying of 'myRole', 'groupType', and 'actionRadius' on group profile
|
2022-09-13 22:06:16 +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ß
|
c6b9cfac67
|
Implement group members count on group profile
- Rename 'Hc*' components to '*'.
|
2022-09-12 11:56:00 +02:00 |
|
Wolfgang Huß
|
621b1a0ba0
|
Implement members list on group profile
|
2022-09-12 09:44:23 +02:00 |
|
Wolfgang Huß
|
c155555ba2
|
Fix locales
|
2022-09-10 08:55:24 +02:00 |
|
Alexander Friedland
|
ca8047138e
|
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 11:31:08 +02:00 |
|
Alexander Friedland
|
b312ce49a5
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 11:31:00 +02:00 |
|
Alexander Friedland
|
a32a2d03be
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 11:30:48 +02:00 |
|
ogerly
|
a9a2097557
|
Merge branch '5059-epic-groups' into 5140-My-Groups-Page
|
2022-09-09 10:14:46 +02:00 |
|
Moriz Wahl
|
2c4f45ad70
|
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-08 15:17:12 +02:00 |
|
Moriz Wahl
|
cc5fcb6704
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-08 15:17:05 +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
|
99d2ce9d29
|
update group data funktion
|
2022-09-08 08:35:29 +02:00 |
|
