14105 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	247adbc650	database migration 0064	2023-03-09 13:35:13 +01:00
Ulf Gebhardt	d989e5c489	rename events	2023-03-09 13:29:46 +01:00
Hannes Heine	e6aecefc26	Merge branch 'master' into fix-info-svg	2023-03-09 13:25:32 +01:00
elweyn	53f48d0475	Remove reopen from deleted tab	2023-03-09 12:59:17 +01:00
Hannes Heine	2b6a5829b4	Merge pull request #2795 from gradido/2741-messageCount-listAllContributions ... fix(backend): add relation messages to database query	2023-03-09 12:51:28 +01:00
elweyn	34def5fdbf	Change info.svg to path	2023-03-09 12:49:12 +01:00
Ulf Gebhardt	e79130ea86	test all events	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	ab4e1cfe1f	fixed imports	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	dfbfefd73a	always write send confirmation event	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	1792d10733	more events for the user resolver	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	0265834744	events for forgot password email and user info update	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	feeeca9fe4	corrected return type	2023-03-09 12:40:46 +01:00
Ulf Gebhardt	b14911d314	logout event	2023-03-09 12:40:45 +01:00
Ulf Gebhardt	09c5aff33e	test contribution link redeem	2023-03-09 12:40:29 +01:00
elweyn	c81013a70e	Remove reopen since it is not used yet	2023-03-09 10:55:01 +01:00
elweyn	dc0e9c478e	Date format if value null => '-'	2023-03-09 10:51:35 +01:00
Ulf Gebhardt	49c83eb768	Merge branch 'master' into 2741-messageCount-listAllContributions	2023-03-09 10:43:38 +01:00
elweyn	d843f0beb0	Merge branch 'master' into 2787-fix-contribution-tab-textes	2023-03-09 10:05:52 +01:00
mahula	6f2ade8c98	Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon	2023-03-09 10:05:45 +01:00
elweyn	ba42c282e4	Remove template for reopen.	2023-03-09 10:05:31 +01:00
elweyn	083f51c0d9	Add moderator confirmedBy to confirmed.	2023-03-09 10:05:08 +01:00
elweyn	acbbc45ec2	Change translation 'denied' to 'rejected'	2023-03-09 08:23:44 +01:00
Hannes Heine	364742762f	Merge pull request #2793 from gradido/2787-fix-ui-for-release ... fix(admin): header and menu	2023-03-09 07:58:09 +01:00
elweyn	8a808d9945	The locale status already existed	2023-03-09 07:57:16 +01:00
Hannes Heine	b23aafb507	Merge branch 'master' into 2787-fix-ui-for-release	2023-03-09 07:41:58 +01:00
elweyn	6685b95551	Merge branch '2787-fix-contribution-tab-textes' of https://github.com/gradido/gradido into 2787-fix-contribution-tab-textes	2023-03-09 07:36:58 +01:00
elweyn	af5212d0c3	Change german local `reopen`	2023-03-09 07:36:09 +01:00
Hannes Heine	e6fdf718d0	Update admin/src/pages/CreationConfirm.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 07:32:26 +01:00
Hannes Heine	c8fea682bc	Update admin/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 07:32:01 +01:00
Hannes Heine	8d3f345d72	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 07:31:44 +01:00
clauspeterhuebner	cf9f020234	Merge branch 'master' into 2730-devops-add-federation-modul-to-deployment-scripts	2023-03-08 22:51:16 +01:00
mahula	156955df14	set jwt expiration in e2e backend .env to two minutes	2023-03-08 20:36:23 +01:00
mahula	9a843f3e67	use different users for e2e tests	2023-03-08 14:43:44 +01:00
elweyn	775d29fb68	Add messageCount value to the contributions that got messages, order the objects in the same order as they are found.	2023-03-08 14:29:25 +01:00
mahula	c4083bef86	fix mistake in cypress config	2023-03-08 14:15:46 +01:00
mahula	d9cf0591fd	linting	2023-03-08 13:53:03 +01:00
mahula	0d822d4240	fix mistake in cypress config	2023-03-08 13:46:53 +01:00
mahula	874fbe9540	set cypress to runn all available e2e tests	2023-03-08 13:38:32 +01:00
mahula	bb7828db19	fix elemet selection for logout e2e test	2023-03-08 13:34:25 +01:00
elweyn	dd44415099	remove unused locale keys	2023-03-08 13:21:47 +01:00
elweyn	747c146bbf	Add to database query relation messages	2023-03-08 12:33:15 +01:00
elweyn	f8e59352ec	Change css style hack to bootstrap	2023-03-08 12:31:17 +01:00
elweyn	5cc5867213	Revert "Add messages to query of listAllContribution" ... This reverts commit a14b9403b1a075b231641b956c2441a2fdfd6c38.	2023-03-08 12:13:45 +01:00
elweyn	d0c5d7aff0	Change position of reopen.	2023-03-08 12:11:34 +01:00
elweyn	a14b9403b1	Add messages to query of listAllContribution	2023-03-08 12:06:44 +01:00
elweyn	cbac8caee2	Change local mod to moderator in contribution tab	2023-03-08 12:06:18 +01:00
elweyn	2dd4d8edee	Localize state to Status & State	2023-03-08 11:52:17 +01:00
elweyn	0f1ec58feb	Add icons on tabs of contribution	2023-03-08 11:47:25 +01:00
elweyn	ed83e11ef1	Change reActive to reopen in OpenCreationsTable	2023-03-08 11:46:49 +01:00
elweyn	b476e84bc6	Remove email for tab open	2023-03-08 10:59:28 +01:00