12873 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	d0a71da633	Merge branch 'master' into feat-filter-buttons	2023-03-14 11:29:44 +01:00
mahula	623e12befe	Merge pull request #6125 from Ocelot-Social-Community/5972-devops-eliminate-annotations-for-e2e-tests ... refactor(other): deactivate video recording & only upload screenshots, if tests fail for e2e tests b2.4.0-342	2023-03-14 11:26:30 +01:00
Hannes Heine	014e537c51	Merge branch 'master' into 5972-devops-eliminate-annotations-for-e2e-tests	2023-03-14 10:54:02 +01:00
Hannes Heine	41e1c722ad	Merge branch 'master' into feat-filter-buttons	2023-03-14 10:52:29 +01:00
Hannes Heine	479232cd87	Merge pull request #6112 from Ocelot-Social-Community/5983-change-design-of-topics(categories)-of-post-teaser ... fix(webapp): change icon color of active topics (categories) of post teaser b2.4.0-341	2023-03-14 10:51:47 +01:00
mahula	00782a10ab	Merge branch 'master' into feat-filter-buttons	2023-03-14 10:43:10 +01:00
Wolfgang Huß	bf695ebd5b	Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser	2023-03-14 10:05:50 +01:00
Hannes Heine	4041ceb5f8	Merge pull request #6059 from Ocelot-Social-Community/add-db-migrate-up-command-to-docu ... docs(other): correct **/README.md b2.4.0-340	2023-03-14 10:04:42 +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
Hannes Heine	2c13c07e46	Merge branch 'master' into add-db-migrate-up-command-to-docu	2023-03-14 09:32:06 +01:00
Wolfgang Huß	9d16d420af	Merge pull request #6110 from Ocelot-Social-Community/5627-fix-responsive-view-on-iphone ... fix(webapp): fix `viewport``width=device-width` by removing it b2.4.0-339	2023-03-14 08:32:33 +01:00
elweyn	eb396424ef	Merge master.	2023-03-14 08:12:24 +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
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
Ulf Gebhardt	528a5decf9	missing permissions	2023-03-14 02:52:39 +01:00
Ulf Gebhardt	e49c5292e2	reseed script	2023-03-14 02:49:20 +01:00
Ulf Gebhardt	3ee9053623	better to encrypt .env	2023-03-14 01:39:27 +01:00
Ulf Gebhardt	57d33821c5	do not encrypt .env	2023-03-14 01:36:55 +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	d5d8597232	deactivate video recording in cypress	2023-03-13 20:46:59 +01:00
Markus	344be595bf	Merge branch 'master' into 5982-fix-donation-bar-blink	2023-03-13 20:43:48 +01:00
Markus	1730443e86	Merge pull request #6121 from Ocelot-Social-Community/6103-newsfeed-bigger-gap-between-posts ... feat(webapp): on newsfeed add bigger y-gap between posts b2.4.0-338	2023-03-13 20:43:09 +01:00
mahula	4b468903a3	remove video upload for e2e tests in github test workflow	2023-03-13 20:41:08 +01:00
mahula	10995665a1	configure screenshot upload to depend on e2e test failure in github test workflow	2023-03-13 20:39:22 +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	0f64235bfb	linting fixes	2023-03-13 16:17:47 +01:00
elweyn	fdf5b1403c	fix linting rules	2023-03-13 15:37:28 +01:00
elweyn	43a96826e4	feat(webapp): change order of groups to new first	2023-03-13 15:27:46 +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	529540bd73	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-03-13 14:45:43 +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
Ulf Gebhardt	3a3e576047	moved values files and removed .gitignore	2023-03-13 13:12:46 +01:00
Ulf Gebhardt	c06b6c82ee	secrets scripts	2023-03-13 13:08:22 +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