5490 Commits

Author SHA1 Message Date
Wolfgang Huß
60e4ff28a7 Remove comment why 'viewport' has to be changed 2023-03-14 07:39:25 +01:00
Wolfgang Huß
7ec6b6d39d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 2023-03-14 07:36:15 +01:00
Wolfgang Huß
a46dd099ac Fix webapp test by sending 'null' if group in post is undefined 2023-03-14 07:32:19 +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
elweyn
22f06de83d Create component for the filter buttons 2023-03-13 10:13:30 +01:00
Markus
f91fd8924e updated unit test for showDonation flag in index page 2023-03-13 10:09:02 +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
Markus
131b2156d0 refactored notification page for mobility 2023-03-10 21:16:22 +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
Wolfgang Huß
fd62a03820 Add hint text to create and edit a post of a group 2023-03-09 18:06:14 +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