2254 Commits

Author SHA1 Message Date
Moriz Wahl
8df7d5d265 get it working 2023-04-25 13:27:25 +02:00
Moriz Wahl
3244f3f86d feat(webapp): group categories on posts 2023-04-25 12:35:46 +02:00
Wolfgang Huß
26b90fce47 Add tooltip to locale switch menu 2023-03-23 08:21:46 +01:00
Wolfgang Huß
28505a5b18 Add tooltip to header notifications menu 2023-03-23 08:11:30 +01:00
Wolfgang Huß
1a1561ce14 Fix locale identifier from 'avatarMenu.Groups' to 'avatarMenu.groups' 2023-03-23 07:55:10 +01:00
Wolfgang Huß
4c0469f61a Add tooltip to header avatar menu
- Add 'showProfileNameTitle' to profile avatar.
2023-03-23 07:51:19 +01:00
elweyn
4dae3dac55 Merge branch 'master' into fix-popover-close-menu 2023-03-20 16:39:34 +01:00
Wolfgang Huß
54f2160780 Fix linting 2023-03-20 15:03:24 +01:00
Wolfgang Huß
d3ec738ee2
Merge branch 'master' into 6146-notification-menu-buttons-position 2023-03-20 15:00:28 +01:00
Wolfgang Huß
e7d6afbc26 Fix by setting 'developerNoAutoClosing: false' 2023-03-20 14:44:53 +01:00
elweyn
593b81c501 fix(webapp): close popover notification menu 2023-03-20 14:44:24 +01:00
elweyn
393c657e27 Add class for the flex items 2023-03-20 14:08:32 +01:00
Wolfgang Huß
f3f7e8c508
Merge branch 'master' into revert-6103-newsfeed-bigger-gap-between-posts 2023-03-20 13:41:12 +01:00
Wolfgang Huß
a1b12568ef Revert PR 'feat(webapp): on newsfeed add bigger y-gap between posts' #6121 2023-03-20 13:36:02 +01:00
elweyn
4cfbf772a0 fix(webapp): small buttons in notifications menu 2023-03-20 11:43:51 +01:00
Moriz Wahl
15391991f2 get the tooltip working 2023-03-18 12:28:28 +01:00
Moriz Wahl
637c3d1ffa
Merge branch 'master' into fix-join-leave-button-for-pending-members 2023-03-18 11:27:45 +01:00
Moriz Wahl
b969630e6e
Merge branch 'master' into notifications-remove-user-from-group 2023-03-17 13:31:03 +01:00
Moriz Wahl
e91ad99f56 fix(webapp): join leave button for pending members 2023-03-17 13:25:59 +01:00
Moriz Wahl
0c4a6ca5c7 add group description to notifications 2023-03-17 11:42:23 +01:00
Moriz Wahl
c18617fc22 group description in notification 2023-03-17 11:37:19 +01:00
Wolfgang Huß
9ded9105a3 Left over of merge conflict 2023-03-16 16:09:18 +01:00
Wolfgang Huß
9dbb8cae41 Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
2023-03-16 16:06:35 +01:00
Wolfgang Huß
84e483a450 Fix variable name 2023-03-16 16:03:51 +01:00
Wolfgang Huß
04b6dc4407 Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
2023-03-16 15:56:40 +01:00
Wolfgang Huß
4f6c9319fb
Update webapp/components/ContributionForm/ContributionForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-16 15:52:31 +01:00
Wolfgang Huß
5c634ca688
Update webapp/components/ContributionForm/ContributionForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-16 15:51:16 +01:00
Wolfgang Huß
424f5c4172 Refine style of contribution (post) form hint text for group post 2023-03-16 15:49:13 +01:00
Moriz Wahl
1501bcb06c linting 2023-03-16 15:14:27 +01:00
Wolfgang Huß
8d98d07d22 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 2023-03-16 13:06:04 +01:00
elweyn
c15a6d1fbe Merge branch '6068-on-create-edit-group-page-have-additional-hint' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 2023-03-16 12:09:05 +01:00
elweyn
9259615a34 Style changes for the action buttons 2023-03-16 12:08:56 +01:00
mahula
c5d3b8830b
Merge branch 'master' into 6014-feature-webapp-join-leave-button-on-group-page-is-misleading 2023-03-16 08:42:20 +01:00
mahula
945f076d6d linting 2023-03-16 08:39:35 +01:00
Moriz Wahl
ab58c569d0 related user for group notifications 2023-03-15 17:49:52 +01:00
Moriz Wahl
60b9262d7a new locales 2023-03-15 16:35:30 +01:00
Moriz Wahl
10c02c251e group notifications in notification dropdown 2023-03-15 16:23:45 +01:00
Wolfgang Huß
3a2e18d794
Merge branch 'master' into 6014-feature-webapp-join-leave-button-on-group-page-is-misleading 2023-03-15 12:48:17 +01:00
elweyn
6223edcb20 Change style ds-flex-item to class name group-item 2023-03-15 12:02:19 +01:00
elweyn
176050082b Add scoped to style 2023-03-15 11:55:18 +01:00
elweyn
be130f849a Fix linting. 2023-03-15 11:44:13 +01:00
mahula
5d5100f08c change join leave button behavior for pending user 2023-03-15 11:43:14 +01:00
elweyn
19ac18af2a Base is now width 98% after md we switch to 48% 2023-03-15 11:08:47 +01:00
elweyn
e2c82116ae feat(webapp): GroupList shows 2 GroupItem per row 2023-03-15 10:43:35 +01:00
Wolfgang Huß
701d1d1dcf
Merge branch 'master' into 6016-feature-refactor-notification-page 2023-03-14 19:49:33 +01:00
Wolfgang Huß
fdb451c87a
Merge branch 'master' into 3157-fix-post-ribbons-position 2023-03-14 19:15:51 +01:00
Wolfgang Huß
3d795558d7 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6016-feature-refactor-notification-page 2023-03-14 14:25:23 +01:00
Wolfgang Huß
3f4f65121a Fix linting 2023-03-14 14:25:15 +01:00
Hannes Heine
3864c8a8d6
Merge branch 'master' into 5967-user-profil-show-more-following-user 2023-03-14 12:05:29 +01:00
Markus
47d7ed3cad added linting for postteaser 2023-03-14 12:03:36 +01:00