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 |
|
Moriz Wahl
|
49288750cf
|
try fixing join group button
|
2023-03-17 11:10:23 +01:00 |
|
mahula
|
556c63a864
|
set jest coverage check for webapp workflow
|
2023-03-16 17:23:56 +01:00 |
|
Moriz Wahl
|
033630e8e3
|
add group type for mark notifications as read
|
2023-03-16 16:55:30 +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 |
|
Moriz Wahl
|
da93e7ff83
|
locales for remove user from group notification
|
2023-03-16 16:02:17 +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
|
ed217a0c14
|
locales for change group member role notification
|
2023-03-16 15:34:08 +01:00 |
|
Moriz Wahl
|
1501bcb06c
|
linting
|
2023-03-16 15:14:27 +01:00 |
|
Moriz Wahl
|
1d277e96a7
|
locales for left group mutation
|
2023-03-16 14:39:55 +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 |
|
mahula
|
6a66c99a7d
|
update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2023-03-15 12:46:10 +01:00 |
|
mahula
|
40a80fa93a
|
update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2023-03-15 12:45:54 +01:00 |
|
elweyn
|
19b81a85b1
|
Change padding-bottom from 5px to 20px
|
2023-03-15 12:17:10 +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 |
|
mahula
|
fe422f5c77
|
add leave and tooltip key tolocales
|
2023-03-15 11:39:03 +01:00 |
|
elweyn
|
19ac18af2a
|
Base is now width 98% after md we switch to 48%
|
2023-03-15 11:08:47 +01:00 |
|
elweyn
|
2eed0986a5
|
Change ds-container to ds-space to remove padding
|
2023-03-15 10:44:15 +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ß
|
5e56b8ba37
|
Merge branch 'master' into 6016-feature-refactor-notification-page
|
2023-03-14 15:25:46 +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 |
|
Wolfgang Huß
|
b1be6321e0
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-14 14:23:54 +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 |
|
Markus
|
36c05edf5c
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-14 11:52:55 +01:00 |
|
Hannes Heine
|
41e1c722ad
|
Merge branch 'master' into feat-filter-buttons
|
2023-03-14 10:52:29 +01:00 |
|
mahula
|
00782a10ab
|
Merge branch 'master' into feat-filter-buttons
|
2023-03-14 10:43:10 +01:00 |
|
Wolfgang Huß
|
b41794aab8
|
Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser
|
2023-03-14 10:00:28 +01:00 |
|
Wolfgang Huß
|
aa161115e7
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6016-feature-refactor-notification-page
|
2023-03-14 07:56:49 +01:00 |
|
Wolfgang Huß
|
2d0a60da58
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5627-fix-responsive-view-on-iphone
|
2023-03-14 07:39:31 +01:00 |
|