4805 Commits

Author	SHA1	Message	Date
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
Markus	851679fe33	increased the y-Gap in the masonry-grid component for a better overview	2023-03-13 15:01:08 +01:00
Markus	f91fd8924e	updated unit test for showDonation flag in index page	2023-03-13 10:09:02 +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ß	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ß	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
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
Moriz Wahl	a784b0f860	test filter by posts in my groups	2023-03-06 16:11:17 +01:00
Moriz Wahl	b63ade8da1	add filter posts by my groups	2023-03-06 16:05:15 +01:00
Moriz Wahl	d2462c34f1	add filter by posts in my groups to store and test it	2023-03-06 16:00:50 +01:00
Moriz Wahl	eb0bc971ec	Update webapp/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2023-03-06 13:47:28 +01:00
Moriz Wahl	6d09dbcf08	Update webapp/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2023-03-06 13:47:14 +01:00
Moriz Wahl	e298a29d8b	test remove user from group	2023-03-03 18:38:41 +01:00
Moriz Wahl	c4d7c20b27	remove user from group implemented	2023-03-03 17:55:22 +01:00
Moriz Wahl	6a84a02027	add remove user from group mutation	2023-03-03 17:46:20 +01:00
Moriz Wahl	e384ec5ea6	message for removal og group members	2023-03-03 17:43:41 +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
Hannes Heine	a3cb9b7212	Merge branch 'master' into 6013-change-benutzer-to-nutzer	2023-03-02 11:16:22 +01:00
Hannes Heine	59525ae373	Merge branch 'master' into 6013-change-benutzer-to-nutzer	2023-03-02 10:54:37 +01:00
Wolfgang Huß	a1fa905f40	Revert "Set Yunite rebranding" ... This reverts commit 2635907ac71320b64a33121c412267662d5e9eb9. # Conflicts: # webapp/assets/styles/imports/_branding.scss	2023-03-01 12:47:47 +01:00
Wolfgang Huß	df49af74a3	Adjust devision space size on footer	2023-03-01 08:01:33 +01:00
Wolfgang Huß	a4a25eb5cf	Replace explicit color #6e8b87 in branding by $color-primary	2023-03-01 07:57:07 +01:00
Wolfgang Huß	e719ae23c9	Adjust ds-chips background color on group teaser and group profile	2023-03-01 07:55:50 +01:00
Wolfgang Huß	ecff8476cf	Replace devision line by pure space	2023-03-01 07:39:03 +01:00
Wolfgang Huß	7278adb09d	Set primary and secondary color correctly for Yunite incl. donation bar and toast	2023-02-28 20:51:21 +01:00
Wolfgang Huß	58fd233e70	Make branding color setting possible or better for donation bar and toaster	2023-02-28 20:49:50 +01:00
Wolfgang Huß	1e742dd42c	Fix linting	2023-02-28 20:48:23 +01:00