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
|
fcf2bba1e8
|
Update webapp/components/Group/GroupList.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:06:25 +02:00 |
|
Alexander Friedland
|
c8dc0d99c0
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:57:27 +02:00 |
|
Alexander Friedland
|
15981750a7
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:34 +02:00 |
|
Alexander Friedland
|
10975f5551
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:24 +02:00 |
|
Alexander Friedland
|
522a9ff4c1
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:03 +02:00 |
|
Alexander Friedland
|
bf492ce9c3
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:31:46 +02:00 |
|
Alexander Friedland
|
c37aef89bc
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:31:36 +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ß
|
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ß
|
e53e502587
|
Removed 'lang="ts"' in 'GroupCard.vue'
|
2022-09-18 18:51:43 +02:00 |
|
Wolfgang Huß
|
7f397b4669
|
Set Vue tooltip delay to 1500 ms and remove unneeded properties
|
2022-09-16 07:05:21 +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 |
|
ogerly
|
b57f5e253c
|
add following event and emit
|
2022-09-14 11:25:43 +02:00 |
|
ogerly
|
f1957c5fe7
|
fix lint
|
2022-09-13 20:46:18 +02:00 |
|
ogerly
|
41955c5f56
|
add gruopMenu
|
2022-09-13 20:40:40 +02:00 |
|
ogerly
|
70b32b9363
|
add disable submit button on formData new and update
|
2022-09-13 15:06:47 +02:00 |
|
ogerly
|
ab2d7ad87d
|
style first step one
|
2022-09-13 09:56:03 +02:00 |
|
ogerly
|
8f3a28ba53
|
add group button in menu, change text
|
2022-09-13 08:15:30 +02:00 |
|
ogerly
|
6d5f37a7b2
|
add success toaster if changeMemberRole
|
2022-09-12 13:19:14 +02:00 |
|
ogerly
|
a2561bde89
|
member management first step
|
2022-09-12 13:16:55 +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
|
e5a969b3f7
|
group settings add sidemenu
|
2022-09-08 17:05:16 +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 |
|