1334 Commits

Author SHA1 Message Date
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
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
19b81a85b1 Change padding-bottom from 5px to 20px 2023-03-15 12:17:10 +01:00
elweyn
2eed0986a5 Change ds-container to ds-space to remove padding 2023-03-15 10:44: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
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
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
baa49414aa Use header-button component 2023-03-13 10:13:51 +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
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
elweyn
89fd312220 feat(webapp): filter button style change 2023-03-09 14:35:15 +01:00
Moriz Wahl
c865b72fa3 refresh notifications after mark all as read, fix tests 2023-03-08 18:11:18 +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
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
Moriz Wahl
1575ee9765 Ebertsche Knöpfe for filter by posts in my groups 2023-03-06 16:20:45 +01:00
Markus
aea21b0989 Fix missing padding above newsfeed for mobile view 2023-03-03 17:43:02 +01:00
Markus
ee6f72c09a Fix gap above news feed by adding a multi column space element 2023-03-02 11:56:16 +01:00
Wolfgang Huß
e719ae23c9 Adjust ds-chips background color on group teaser and group profile 2023-03-01 07:55:50 +01:00
elweyn
fb879f96b6 Merge branch 'master' into fix-description-not-show-null 2023-02-28 08:10:09 +01:00
Moriz Wahl
5f70189a2b
Merge pull request #5968 from Ocelot-Social-Community/webapp-upgrade-jest
refactor(webapp): upgrade jest and vue test util
2023-02-27 11:08:36 +01:00
Markus
cecd506581 removed gap above news feed in desktop view 2023-02-27 10:45:46 +01:00
Markus
42a370ffc8 set showDonations flag to false as default to avoid blinking 2023-02-27 10:42:20 +01:00
Moriz Wahl
e8ca65c040 remove comments 2023-02-23 21:13:18 +01:00
Moriz Wahl
b75c7c6977 hack MapboxGeocoder in unit tests by simply stubbing the import 2023-02-23 18:13:19 +01:00
elweyn
8df83adc2f Remove markers from MapboxGeocoder the users and groups marks are not affected. 2023-02-23 07:18:14 +01:00
elweyn
97c87e2f93 Fix linting. 2023-02-22 09:01:09 +01:00
elweyn
9bdc9fe2ef Add align center to the user profile slug. 2023-02-22 07:56:13 +01:00
elweyn
5cd3725a0d Withdrew space. 2023-02-21 11:39:51 +01:00
elweyn
b5de63f43f Remove lint fixe that isn't needed anymore. 2023-02-21 10:23:49 +01:00
elweyn
c3b2379af0 markers.geoJSON made 'null' out of a property that had null in it. So added a check on the value and set undefined if value is null. 2023-02-21 10:22:16 +01:00
elweyn
df078f18d8 Correct order of tests. 2023-02-21 06:01:42 +01:00
elweyn
f104bdcdd0 Correct linting. 2023-02-21 05:59:11 +01:00
elweyn
43bb4685d3 Check that about !== 'null' cause the resolver has an undefinedToNull. 2023-02-21 05:26:25 +01:00
Moriz Wahl
038bae5571 stub router link 2023-02-15 07:56:48 +01:00
Moriz Wahl
4850e456fe pages tests nearly working 2023-02-13 23:08:41 +01:00
Moriz Wahl
b2eda033ee all admin pages tests are working 2023-02-13 21:39:57 +01:00
Moriz Wahl
0d5f87c2a3 fix donations test 2023-02-13 21:33:35 +01:00
Moriz Wahl
b3f50e04d8 all settings tests work again 2023-02-13 21:23:36 +01:00
Moriz Wahl
7d459fcea5 get settings pages mostly running 2023-02-13 21:09:24 +01:00
Moriz Wahl
b2be8a301e first pages test working 2023-02-13 20:29:16 +01:00