12922 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	2f0b2f63df	echo current configuration when running scripts	2023-03-20 16:50:46 +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
Ulf Gebhardt	76f7362a0a	upgrade script correction	2023-03-20 13:29:19 +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
Wolfgang Huß	424f5c4172	Refine style of contribution (post) form hint text for group post	2023-03-16 15:49:13 +01:00
Moriz Wahl	ed217a0c14	locales for change group member role notification	2023-03-16 15:34:08 +01:00
Moriz Wahl	35f3da9984	notify user when role in group changed	2023-03-16 15:31:09 +01:00
Moriz Wahl	1501bcb06c	linting	2023-03-16 15:14:27 +01:00
Moriz Wahl	a25e6eb326	notify leave group	2023-03-16 15:09:19 +01:00
Moriz Wahl	1d277e96a7	locales for left group mutation	2023-03-16 14:39:55 +01:00
Wolfgang Huß	8d98d07d22	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint	2023-03-16 13:06:04 +01:00
Ulf Gebhardt	46d1c84077	Merge pull request #6145 from Ocelot-Social-Community/deployment-upgrade-to-specific-version ... fix(other): use access token to trigger build on external repo	2023-03-16 12:19:20 +01:00
elweyn	c15a6d1fbe	Merge branch '6068-on-create-edit-group-page-have-additional-hint' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint	2023-03-16 12:09:05 +01:00
elweyn	9259615a34	Style changes for the action buttons	2023-03-16 12:08:56 +01:00
Ulf Gebhardt	357a657f91	Merge branch 'master' into deployment-upgrade-to-specific-version	2023-03-16 11:47:33 +01:00
mahula	0f4174885c	Merge pull request #6124 from Ocelot-Social-Community/6014-feature-webapp-join-leave-button-on-group-page-is-misleading ... feat(webapp): set different icon and text on join leave button, when member is pending	2023-03-16 09:55:30 +01:00
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
mahula	945f076d6d	linting	2023-03-16 08:39:35 +01:00
Ulf Gebhardt	7ab2c24f7a	Merge branch 'master' into deployment-upgrade-to-specific-version	2023-03-15 20:24:55 +01:00
Ulf Gebhardt	ed76f69a8c	use access token to trigger build on external repo	2023-03-15 20:25:06 +01:00
Ulf Gebhardt	4dfeeddd7c	Merge pull request #6143 from Ocelot-Social-Community/deployment-upgrade-to-specific-version ... refactor(other): deployment upgrade to specific version, trigger build on stage	2023-03-15 19:32:56 +01:00