12939 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	bfca086e7b	only drop indexes if they exist	2023-03-20 22:17:07 +01:00
Ulf Gebhardt	ce57df3bce	Merge branch 'master' into migration-search-indexes	2023-03-20 21:41:33 +01:00
Ulf Gebhardt	6e2b65e124	lint fixes	2023-03-20 21:40:57 +01:00
Hannes Heine	2876b59863	Merge pull request #6163 from Ocelot-Social-Community/deployment-stage-ocelot-is-branded ... refactor(other): build & deployment of branded images on stage.ocelot.social	2023-03-20 18:06:16 +01:00
Hannes Heine	214b681ce5	Merge branch 'master' into deployment-stage-ocelot-is-branded	2023-03-20 17:25:03 +01:00
Hannes Heine	6151d91ef1	Merge pull request #6166 from Ocelot-Social-Community/fix-popover-close-menu ... fix(webapp): close popover notification menu	2023-03-20 17:24:44 +01:00
elweyn	4dae3dac55	Merge branch 'master' into fix-popover-close-menu	2023-03-20 16:39:34 +01:00
Hannes Heine	5fbbffe34b	Merge pull request #6162 from Ocelot-Social-Community/6146-notification-menu-buttons-position ... fix(webapp): small buttons in notifications menu	2023-03-20 16:32:46 +01:00
Wolfgang Huß	54f2160780	Fix linting	2023-03-20 15:03:24 +01:00
Wolfgang Huß	d3ec738ee2	Merge branch 'master' into 6146-notification-menu-buttons-position	2023-03-20 15:00:28 +01:00
Wolfgang Huß	43f2c02f93	Merge pull request #6164 from Ocelot-Social-Community/revert-6103-newsfeed-bigger-gap-between-posts ... fix(webapp): revert pr `on newsfeed add bigger y-gap between posts #6121`	2023-03-20 14:56:05 +01:00
Wolfgang Huß	e7d6afbc26	Fix by setting 'developerNoAutoClosing: false'	2023-03-20 14:44:53 +01:00
elweyn	593b81c501	fix(webapp): close popover notification menu	2023-03-20 14:44:24 +01:00
elweyn	393c657e27	Add class for the flex items	2023-03-20 14:08:32 +01:00
Ulf Gebhardt	b3f5bf4e6a	new migration to create search indexes	2023-03-20 14:06:10 +01:00
Wolfgang Huß	f3f7e8c508	Merge branch 'master' into revert-6103-newsfeed-bigger-gap-between-posts	2023-03-20 13:41:12 +01:00
Ulf Gebhardt	7e158b5136	Merge branch 'master' into deployment-stage-ocelot-is-branded	2023-03-20 13:39:04 +01:00
Ulf Gebhardt	4f6184401c	updated stage.ocelot.social repo reference	2023-03-20 13:38:37 +01:00
Ulf Gebhardt	e5b8aadbbe	missing trailing slash	2023-03-20 13:38:19 +01:00
Wolfgang Huß	a1b12568ef	Revert PR 'feat(webapp): on newsfeed add bigger y-gap between posts' #6121	2023-03-20 13:36:02 +01:00
Ulf Gebhardt	76f7362a0a	upgrade script correction	2023-03-20 13:29:19 +01:00
elweyn	4cfbf772a0	fix(webapp): small buttons in notifications menu	2023-03-20 11:43:51 +01:00
Moriz Wahl	8e58e1a395	Merge pull request #6152 from Ocelot-Social-Community/fix-join-leave-button-for-pending-members ... fix(webapp): join leave button for pending members	2023-03-20 11:39:44 +01:00
Ulf Gebhardt	c837e3354a	update stage.ocelot.social submodule	2023-03-20 11:35:26 +01:00
Ulf Gebhardt	f638810606	remove publish-branded workflow, rename build trigger	2023-03-20 11:34:33 +01:00
Ulf Gebhardt	49ed4437f4	make configuration a mandatory variable	2023-03-20 11:01:53 +01:00
Ulf Gebhardt	36f4e89b80	updated stage.ocelot.social submodule reference	2023-03-20 11:01:13 +01:00
Ulf Gebhardt	61b5112b8b	moved example into stage.ocelot.social	2023-03-20 10:59:49 +01:00
Ulf Gebhardt	1b41d3bb7c	stage.ocelot.social as submodule	2023-03-20 10:53:00 +01:00
Moriz Wahl	15391991f2	get the tooltip working	2023-03-18 12:28:28 +01:00
Moriz Wahl	637c3d1ffa	Merge branch 'master' into fix-join-leave-button-for-pending-members	2023-03-18 11:27:45 +01:00
Moriz Wahl	846495dc58	Merge pull request #6150 from Ocelot-Social-Community/notifications-remove-user-from-group ... feat(backend): notifications for groups	2023-03-18 11:27:08 +01:00
Moriz Wahl	b969630e6e	Merge branch 'master' into notifications-remove-user-from-group	2023-03-17 13:31:03 +01:00
Moriz Wahl	e91ad99f56	fix(webapp): join leave button for pending members	2023-03-17 13:25:59 +01:00
Moriz Wahl	0c4a6ca5c7	add group description to notifications	2023-03-17 11:42:23 +01:00
Moriz Wahl	c18617fc22	group description in notification	2023-03-17 11:37:19 +01:00
Moriz Wahl	49288750cf	try fixing join group button	2023-03-17 11:10:23 +01:00
Wolfgang Huß	6480e9ec51	Merge pull request #6114 from Ocelot-Social-Community/6068-on-create-edit-group-page-have-additional-hint ... feat(webapp): add hint text to create and edit a post of a group aside of the save and abort buttons	2023-03-16 17:45:51 +01:00
Moriz Wahl	282fc347f1	remove unused enum type	2023-03-16 16:58:52 +01:00
Moriz Wahl	033630e8e3	add group type for mark notifications as read	2023-03-16 16:55:30 +01:00
Moriz Wahl	d8df95d093	notifications as read with myRole for groups	2023-03-16 16:54:40 +01:00
Wolfgang Huß	9ded9105a3	Left over of merge conflict	2023-03-16 16:09:18 +01:00
Moriz Wahl	5f38c74d82	fix flaky test	2023-03-16 16:08:33 +01:00
Wolfgang Huß	9dbb8cae41	Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint ... # Conflicts: # webapp/components/ContributionForm/ContributionForm.vue	2023-03-16 16:06:35 +01:00
Wolfgang Huß	84e483a450	Fix variable name	2023-03-16 16:03:51 +01:00
Moriz Wahl	da93e7ff83	locales for remove user from group notification	2023-03-16 16:02:17 +01:00
Moriz Wahl	6adfac1c7b	notify user when removed from group	2023-03-16 16:01:46 +01:00
Wolfgang Huß	04b6dc4407	Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint ... # Conflicts: # webapp/components/ContributionForm/ContributionForm.vue	2023-03-16 15:56:40 +01:00
Wolfgang Huß	4f6c9319fb	Update webapp/components/ContributionForm/ContributionForm.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-16 15:52:31 +01:00
Wolfgang Huß	5c634ca688	Update webapp/components/ContributionForm/ContributionForm.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-16 15:51:16 +01:00