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 |
|
Alexander Friedland
|
72eca64075
|
Merge pull request #5148 from Ocelot-Social-Community/5140-My-Groups-Page
feat: 🍰 My Groups Page
|
2022-09-12 09:25:25 +02:00 |
|
Wolfgang Huß
|
1796a04a9c
|
Update webapp/components/Group/GroupForm.vue
|
2022-09-10 08:57:06 +02:00 |
|
Wolfgang Huß
|
c155555ba2
|
Fix locales
|
2022-09-10 08:55:24 +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
|
7cb965e9ad
|
Update webapp/pages/group/edit/_id.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 13:04:26 +02:00 |
|
Alexander Friedland
|
62f57681eb
|
Update webapp/pages/group/edit/_id.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 13:04:15 +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 |
|
Alexander Friedland
|
07b3857e4b
|
Update webapp/pages/group/edit/_id/index.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 12:18:57 +02:00 |
|
ogerly
|
3d5f29c0f1
|
change page structure for groupe settings
|
2022-09-09 12:17:48 +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
|
109a5f5aa4
|
fix lint
|
2022-09-09 11:11:15 +02:00 |
|
ogerly
|
362aae3c5b
|
add router in group settings
|
2022-09-09 11:10:11 +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 |
|
Wolfgang Huß
|
d87c0271a1
|
Merge pull request #5317 from Ocelot-Social-Community/5059-groups/5316-in-be-hidden-groups-not-listed-for-none-or-pending-members
feat: 🍰 Hidden Groups Shall Not Be Visible For None Or Pending Members In Backend
|
2022-09-08 15:42:18 +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 |
|
Wolfgang Huß
|
6879b1112c
|
Refine tests of 'Group' resolver
|
2022-09-08 13:11:55 +02:00 |
|
Wolfgang Huß
|
00ccf5ed9a
|
Implement and test to find no hidden groups by 'Group' resolver where user is none or 'pending' member
|
2022-09-08 12:55:16 +02:00 |
|
ogerly
|
571e8fbddc
|
resolve conflicts 2
|
2022-09-08 12:20:28 +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 |
|
Wolfgang Huß
|
0f9cc6864e
|
Merge pull request #5197 from Ocelot-Social-Community/5059-groups/5190-group-profile
feat: 🍰 Implement Group Profile
|
2022-09-08 10:59:51 +02:00 |
|
ogerly
|
fe6ad2cff3
|
add better seed for group myRole
|
2022-09-08 09:55:58 +02:00 |
|
Wolfgang Huß
|
dcf9a91ffc
|
Fix groups seeding
|
2022-09-08 09:06:18 +02:00 |
|
ogerly
|
99d2ce9d29
|
update group data funktion
|
2022-09-08 08:35:29 +02:00 |
|
Moriz Wahl
|
01dd0dc038
|
Merge pull request #5301 from Ocelot-Social-Community/fix-category-filter-menu
fix: Category Filter Menu Client Only
|
2022-09-07 12:57:45 +02:00 |
|
Wolfgang Huß
|
99b1a164a8
|
Remove testing of group profile for now
|
2022-09-07 12:29:17 +02:00 |
|
Wolfgang Huß
|
ee770aa204
|
Cleanup
|
2022-09-07 12:25:08 +02:00 |
|
Wolfgang Huß
|
fa79c25e9b
|
Implement join button on Group profile, a start
|
2022-09-07 11:12:34 +02:00 |
|
Moriz Wahl
|
f5d8014f6c
|
fix: Category Filter Menu Client Only
|
2022-09-07 11:06:43 +02:00 |
|
Moriz Wahl
|
1c2a2a05fe
|
Merge pull request #5261 from Ocelot-Social-Community/save-category-settings
feat: Save Category Settings
|
2022-09-07 09:14:58 +02:00 |
|
Wolfgang Huß
|
d11b512bfb
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile
|
2022-09-07 08:32:05 +02:00 |
|
Wolfgang Huß
|
705ab9a0a3
|
Merge pull request #5224 from Ocelot-Social-Community/5059-groups/5131-implement-update-group-resolver
feat: 🍰 Implement `UpdateGroup` Resolver
|
2022-09-06 19:51:43 +02:00 |
|
Moriz Wahl
|
8a688ca78b
|
improve tests
|
2022-09-06 15:14:31 +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 |
|
ogerly
|
228a676cd5
|
fix locales
|
2022-09-06 12:20:25 +02:00 |
|
ogerly
|
dbb8006432
|
Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page
|
2022-09-06 12:12:08 +02:00 |
|
ogerly
|
74b679c2c0
|
Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page
|
2022-09-06 12:08:46 +02:00 |
|