4825 Commits

Author SHA1 Message Date
Hannes Heine
3864c8a8d6
Merge branch 'master' into 5967-user-profil-show-more-following-user 2023-03-14 12:05:29 +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ß
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
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
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
elweyn
22f06de83d Create component for the filter buttons 2023-03-13 10:13:30 +01:00
elweyn
e7d43e5019 Fix linting 2023-03-13 07:38:48 +01:00
elweyn
ba6a05ff69 Upgrade filterButtonMenu size 2023-03-13 07:37:09 +01:00
elweyn
6b1a01f66f Change style of postsInMyGroups filter button 2023-03-13 07:36:26 +01:00
Hannes Heine
cfa53e5b84
Merge branch 'master' into feat-filter-buttons 2023-03-13 07:08:14 +01:00
elweyn
f34e419571 Fix linting. 2023-03-13 07:02:55 +01:00
Wolfgang Huß
4a446706ce
Merge branch 'master' into 5984-fix-gap-news-feed 2023-03-10 12:02:18 +01:00
Wolfgang Huß
59a6729171 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5984-fix-gap-news-feed 2023-03-10 11:22:55 +01:00
Wolfgang Huß
69ab2ec626 Fix linting 2023-03-10 11:10:29 +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ß
eb9daebe52 Change 'viewport' on maintenance page as well and add comment 2023-03-09 20:13:56 +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
elweyn
89fd312220 feat(webapp): filter button style change 2023-03-09 14:35:15 +01:00
Wolfgang Huß
b9d5fe449e Fix 'viewport' 'width=device-width' by removing it, because it does not work correctly for Safari on iOS 2023-03-09 14:35:02 +01:00
Wolfgang Huß
d10b8b7351
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 14:24:48 +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
mahula
cf6116b5d9 change locales for invitation link short description 2023-03-09 13:02:28 +01:00
Wolfgang Huß
8e7009c149
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 11:04:37 +01:00
Moriz Wahl
c865b72fa3 refresh notifications after mark all as read, fix tests 2023-03-08 18:11:18 +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
Wolfgang Huß
b28a595ae4 Change group filter button text 2023-03-08 16:22:53 +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
elweyn
0b7e0fbc4b Change Infinity to exact count. 2023-03-07 13:16:38 +01:00
Wolfgang Huß
98bc200fbc
Merge branch 'master' into 6062-adjust-and-create-branding-possibilities 2023-03-06 18:01:15 +01:00
Moriz Wahl
32aa5892a6 improve code 2023-03-06 16:29:35 +01:00
Moriz Wahl
1fa8831110 undo changes to filter menu section 2023-03-06 16:25:45 +01:00
Moriz Wahl
1575ee9765 Ebertsche Knöpfe for filter by posts in my groups 2023-03-06 16:20:45 +01:00