4381 Commits

Author SHA1 Message Date
Moriz Wahl
cb1e9f95e0 add headers for group search 2022-10-21 17:51:43 +02:00
Moriz Wahl
3fb4146d62 Merge branch 'master' into 5059-epic-groups 2022-10-21 16:58:32 +02:00
Wolfgang Huß
46e4d1d945 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-21 11:30:41 +02:00
Wolfgang Huß
937954b6f6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups
# Conflicts:
#	webapp/layouts/default.vue
2022-10-21 11:23:27 +02:00
Wolfgang Huß
daea147772 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5523-make-click-on-logo-configurable
# Conflicts:
#	webapp/layouts/default.vue
2022-10-21 10:40:56 +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
ogerly
de33b2288d fix lint 2022-10-20 16:01:16 +02:00
ogerly
af5447e830 coverage 65.14%, add specs GroupList.spec, GroupMember.spec 2022-10-20 15:58:34 +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ß
25c1c7ff90 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-19 19:01:01 +02:00
Moriz Wahl
43bf1ae79d refactor: Category Filter in Filter Menu 2022-10-19 13:44:17 +02:00
Wolfgang Huß
b0838d9bf6 Cleanup 2022-10-19 13:29:17 +02:00
Wolfgang Huß
419ac06d9c Implement 'LOGO_HEADER_CLICK' as configuration 2022-10-19 12:57:21 +02:00
Moriz Wahl
89e1de0f14 mock route query group id 2022-10-19 09:28:15 +02:00
Moriz Wahl
7b69a4dc3f deactivate deprecated test 2022-10-19 09:24:08 +02:00
Moriz Wahl
25001ce6ab mock route params 2022-10-19 09:21:08 +02:00
Moriz Wahl
61ae38065c add callback for data object to Wrapper function 2022-10-19 09:14:42 +02:00
Moriz Wahl
78f03daf42 add groupId to variables in spec 2022-10-19 09:14:17 +02:00
ogerly
79644cb60a add locals for group member 2022-10-18 19:29:48 +02:00
Wolfgang Huß
490c7bf2bf Refine logic of location 2022-10-18 19:12:01 +02:00
Wolfgang Huß
ab6b5ad219 Fix 'ds-chip' 'color' error 2022-10-18 18:28:52 +02:00
Wolfgang Huß
4521c71718 Fix location bugs 2022-10-18 18:14:38 +02:00
ogerly
3c4d4bb8eb style flex find user per slug 2022-10-18 14:43:29 +02:00
ogerly
548dcaaf6e dynamic load by add new group member per slug 2022-10-18 14:23:14 +02:00
ogerly
a8cf6acd93 add slug user to group member 2022-10-18 13:38:05 +02:00
ogerly
2755ca6562 change location in group update 2022-10-18 09:54:45 +02:00
ogerly
11f5ce746a search input for invite user in group 2022-10-17 16:47:37 +02:00
ogerly
1a273918b5 remove console statments, fix lint 2022-10-17 12:07:27 +02:00
ogerly
9baabd0737 change sameLocation and delete Location Button position 2022-10-17 12:05:35 +02:00
ogerly
fc75d4f370 rename computed disableButtomByUpdate to disableButtonByUpdate 2022-10-16 13:03:10 +02:00
ogerly
018cfc68b1 check groupForm disableButton if creat and update 2022-10-16 12:58:00 +02:00
Wolfgang Huß
95cb82da34 Make configurable header menu translatable 2022-10-15 16:11:28 +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ß
42f5df78e4 Cleanup 2022-10-07 23:34:43 +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ß
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
9528365cd4 add ds-space if update GroupForm 2022-10-07 06:58:21 +02:00
Wolfgang Huß
009558f5fc Remove unused variable 2022-10-05 16:59:46 +02:00
Wolfgang Huß
350d59bf12 Refine create and edit group form 2022-10-05 16:56:59 +02:00
ogerly
68cb597fa6 Merge branch '5397-Refine-Group-Creation-And-Group-Edit' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 5397-Refine-Group-Creation-And-Group-Edit 2022-10-04 10:11:31 +02:00
ogerly
d4b5823cf1 fix lint 2022-10-04 10:11:07 +02:00
ogerly
cbedf6f046 change from review 2022-10-04 10:09:56 +02:00
Alexander Friedland
f94fc5d211
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-10-04 08:35:09 +02:00
ogerly
60303b172b fix lint 2022-10-02 11:06:44 +02:00
ogerly
ff0396a650 check valid group form selects 2022-10-02 11:06:11 +02:00
ogerly
b1e0f9655e resolve review from wolle 2022-09-30 11:24:18 +02:00
ogerly
8ecd6bb0e7 resolve review from wolle 2022-09-30 11:24:00 +02:00
ogerly
90b64dc0f3 resolve review fix 2022-09-30 10:49:54 +02:00
ogerly
cf7e61a2fc add default color on ds-chip in GroupForm.vue 2022-09-29 15:49:23 +02:00