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 |
|
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 |
|
Wolfgang Huß
|
60e4ff28a7
|
Remove comment why 'viewport' has to be changed
|
2023-03-14 07:39:25 +01:00 |
|
Markus
|
a5d6bd037b
|
set ribbons position as divider between user teaser and hero image on post teaser component
|
2023-03-13 20:52:13 +01:00 |
|
Markus
|
344be595bf
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-13 20:43:48 +01:00 |
|
Markus
|
7b1f4cb7e5
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-13 17:21:01 +01:00 |
|
mahula
|
f38cf84288
|
add mode forpending user to join leave button
|
2023-03-13 17:02:37 +01:00 |
|
Markus
|
f42eeb0104
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:37 +01:00 |
|
Markus
|
12861834fb
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:25 +01:00 |
|
Markus
|
736bc2719a
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:17 +01:00 |
|
Markus
|
e1a18527cf
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:02 +01:00 |
|
Markus
|
d4149e964d
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:55:43 +01:00 |
|
Markus
|
6727a61329
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:55:31 +01:00 |
|
Markus
|
5d54c1af1f
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:54:37 +01:00 |
|
elweyn
|
fdf5b1403c
|
fix linting rules
|
2023-03-13 15:37:28 +01:00 |
|
Markus
|
851679fe33
|
increased the y-Gap in the masonry-grid component for a better overview
|
2023-03-13 15:01:08 +01:00 |
|
elweyn
|
b15d2ff252
|
Add user['Count'] to fetchAllConntections tests.
|
2023-03-13 14:10:16 +01:00 |
|
mahula
|
6eccde6cbe
|
change locales key roles.usual
|
2023-03-13 13:55:08 +01:00 |
|
mahula
|
691fa9b744
|
add key pendingMember to locales
|
2023-03-13 13:52:47 +01:00 |
|
Markus
|
8007eb7683
|
updated notificationstable component test
|
2023-03-13 10:40:41 +01:00 |
|
elweyn
|
644febaa0f
|
Remove border radius of filterMenu background
|
2023-03-13 10:38:08 +01:00 |
|
elweyn
|
50e5a4e8aa
|
Change margin on small screens
|
2023-03-13 10:31:32 +01:00 |
|
elweyn
|
6858fa58ab
|
Add small margin to the top
|
2023-03-13 10:31:07 +01:00 |
|
elweyn
|
baa49414aa
|
Use header-button component
|
2023-03-13 10:13:51 +01:00 |
|