4308 Commits

Author SHA1 Message Date
Wolfgang Huß
07b03d50b5 Remove doubled 'GroupButton' 2022-09-28 17:02:34 +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
Alexander Friedland
4c55ca731e
Update webapp/pages/my-groups.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-23 08:59:45 +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
4753630418
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-23 08:32:49 +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
Wolfgang Huß
a618366619 Release v1.1.1 - refactor rebranding 2022-09-22 20:02:34 +02:00
ogerly
858739eaa0 fix review 2022-09-22 18:42:58 +02:00
ogerly
1af5ce9e30 add [200~.ds-footer a {scss token 2022-09-22 18:20:13 +02:00
ogerly
4045260fc3 remove console log, fix lint 2022-09-22 17:55:17 +02:00
ogerly
5f5c0faa1f cleanup refactor rebranding 2022-09-22 17:52:03 +02:00
ogerly
0293fec7e7 step1 refactor rebranding 2022-09-22 16:51:48 +02:00
ogerly
58e48cfe77 rebrand in config for scss and styleguide 2022-09-21 12:09:35 +02:00
Wolfgang Huß
c47aef09f5 Cleanup 2022-09-21 08:02:58 +02:00
Wolfgang Huß
a20d66b1bc Fix type validation error in BaseButton 2022-09-21 08:01:47 +02:00
ogerly
28c4740a98 add code if condition 2022-09-20 19:54:53 +02:00
Wolfgang Huß
66fe131f70 Test group profile page, the end 2022-09-20 17:10:45 +02:00
ogerly
1fdee4058d fix yarn 2022-09-20 16:51:33 +02:00
ogerly
5974ff7c24 change footer links 2022-09-20 16:50:34 +02:00
ogerly
a1292ef9ff fix lint 2022-09-20 16:03:50 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00