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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Markus
|
8007eb7683
|
updated notificationstable component test
|
2023-03-13 10:40:41 +01:00 |
|
elweyn
|
6858fa58ab
|
Add small margin to the top
|
2023-03-13 10:31:07 +01:00 |
|
elweyn
|
22f06de83d
|
Create component for the filter buttons
|
2023-03-13 10:13:30 +01:00 |
|
Markus
|
131b2156d0
|
refactored notification page for mobility
|
2023-03-10 21:16:22 +01:00 |
|
Wolfgang Huß
|
8a4ee7503c
|
Merge branch 'master' into 6069-change-shout-horn-on-posts-to-heart
|
2023-03-10 09:45:15 +01:00 |
|
Wolfgang Huß
|
3f875525f2
|
Change shout icon 'bullhorn' to 'heart-o'
|
2023-03-09 18:41:34 +01:00 |
|
Wolfgang Huß
|
0172d5bb3b
|
Merge branch 'master' into 5978-refactor-change-invite-code-button-and-menu-to-copy-invite-link
|
2023-03-09 18:23:34 +01:00 |
|
mahula
|
66e7edc2f8
|
linting
|
2023-03-09 16:03:48 +01:00 |
|
mahula
|
f5b3adc842
|
center button in invite link popover
|
2023-03-09 15:48:33 +01:00 |
|
mahula
|
c9d6e1a9ea
|
add tooltip to invite button
|
2023-03-09 15:43:58 +01:00 |
|
Wolfgang Huß
|
c965f3d29d
|
Set color of active category icons to '$color-primary-inverse'
- Change background-color of active categories to '$color-primary-active'
|
2023-03-09 15:25:07 +01:00 |
|
Wolfgang Huß
|
cfb07809c7
|
Rename 'HcCategory' to 'Category' on main index page
|
2023-03-09 15:23:10 +01:00 |
|
Moriz Wahl
|
5bd831752d
|
Merge branch 'master' into feature/mark-all-notification-as-read
|
2023-03-09 13:23:09 +01:00 |
|
mahula
|
9a59799b2b
|
change copy text in invite button menu
|
2023-03-09 13:10:57 +01:00 |
|
Moriz Wahl
|
b64e35c69b
|
fix typo
|
2023-03-08 17:11:57 +01:00 |
|
Moriz Wahl
|
bdc1cb33da
|
Merge branch 'master' into feature/mark-all-notification-as-read
|
2023-03-08 16:50:02 +01:00 |
|
Moriz Wahl
|
bd11c33f91
|
Merge branch 'master' into remove-user-from-group
|
2023-03-08 16:00:19 +01:00 |
|
Moriz Wahl
|
7fcb9a0ff6
|
use base button
|
2023-03-07 22:33:14 +01:00 |
|
Moriz Wahl
|
f75059b830
|
Merge branch 'master' into filter-posts-in-my-groups
|
2023-03-07 13:30:02 +01:00 |
|