IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,625 Commits 5 Branches 2 Tags
Commit Graph

4331 Commits

Author SHA1 Message Date
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
ogerly
3ebfc7c145 add constants GOAL_LENGTH_MIN 2022-09-29 14:35:23 +02:00
ogerly
584663686a delete LocationName in form 2022-09-29 14:30:23 +02:00
ogerly
ab0f381747 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-09-29 11:54:48 +02:00
ogerly
e09fb1768f fix lint 2022-09-29 11:54:24 +02:00
ogerly
0a511b4ea2 form submit dissable by update 2022-09-29 11:53:51 +02:00
ogerly
992dd991c9 form error alternativ 2022-09-29 11:09:50 +02:00
Alexander Friedland
00fad09486
Merge branch '5344-add-group-members-management' into 5397-Refine-Group-Creation-And-Group-Edit 2022-09-28 20:29:39 +02:00
Wolfgang Huß
07b03d50b5 Remove doubled 'GroupButton' 2022-09-28 17:02:34 +02:00
ogerly
1199c5d77a fix lint 2022-09-28 15:21:40 +02:00
ogerly
f21796b5e2 delete location entry per button 2022-09-28 15:20:51 +02:00
ogerly
b965bab56b translation selects in GroupForm.vue, change css of selects 2022-09-28 14:36:35 +02:00
ogerly
fdc72c71a4 resolve conflicts 2022-09-28 10:34:20 +02:00
ogerly
8ff171395c delete unused code 2022-09-28 10:17:29 +02:00
ogerly
6364974b71 add editor component for GroupForm.vue 2022-09-28 10:15:39 +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ß
421f8a69a2 Enhance tests of 'AvatarMenu' 2022-09-27 16:28:23 +02:00
Wolfgang Huß
f62df1f4aa Add 'my groups' to avatar menu 2022-09-27 16:10:17 +02:00
Wolfgang Huß
8867f8674f Make group button in header configurable 2022-09-27 16:09:33 +02:00
Wolfgang Huß
60b68ed63c Add 'SHOW_GROUP_BUTTON_IN_HEADER' in 'groups.js', still unused 2022-09-27 13:47:01 +02:00
ogerly
c2dc8b47a0 fix lint 2022-09-27 11:24:48 +02:00
ogerly
e430f22392 add test GroupContentMenu ans GroupForm 2022-09-27 11:24:02 +02:00
Wolfgang Huß
8ff8d55d6d Implement 'GroupButton' in 'default' layout 2022-09-26 21:43:13 +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ß
023ee74633 Cleanup 2022-09-25 13:22:24 +02:00
Wolfgang Huß
41af877ab5 Refine functionality, second step 2022-09-25 13:22:07 +02:00
Wolfgang Huß
5392da0983 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-24 18:18:20 +02:00
Wolfgang Huß
84d90ddb78 Refine design and a bit functionality, additions to first step 2022-09-24 18:13:55 +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
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
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
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
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