13614 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Claus-Peter Hübner	297abea1ec	linting	2023-03-09 15:48:24 +01:00
Ulf Gebhardt	4d19ce06b5	fix test	2023-03-09 15:18:51 +01:00
Hannes Heine	6bdf82c25e	Update admin/src/pages/CreationConfirm.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 15:18:26 +01:00
elweyn	923cc5d81e	Extract format date or - to a method.	2023-03-09 15:14:16 +01:00
Ulf Gebhardt	becabb861c	fix types	2023-03-09 14:41:35 +01:00
Claus-Peter Hübner	57008e3355	Merge branch '2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey' of github.com:gradido/gradido into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey	2023-03-09 14:41:19 +01:00
Claus-Peter Hübner	a1e8a4aab2	linting	2023-03-09 14:40:28 +01:00
Hannes Heine	159d1f2a51	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 14:38:27 +01:00
Ulf Gebhardt	e3add830c3	turn @typescript-eslint/prefer-regex-exec	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	b530576a84	revert regex.exec to string.match	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	09d2db3028	unsaved changes, include float from type-graphql	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	230a47d32b	GDT Balance returns float	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	18491cc380	timeUsed is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	2783a6c62e	gdtSum is float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	16914e3d98	gdt balance is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	19adc53ed7	fix newly introduced errors	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	827c829306	fixes based on the unit tests	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	3391b3a9ee	merge	2023-03-09 14:37:17 +01:00
Ulf Gebhardt	b34208b81a	Merge branch 'master' into eslint-plugin-type-graphql	2023-03-09 14:31:04 +01:00
clauspeterhuebner	aef858d30a	Merge branch 'master' into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey	2023-03-09 14:26:55 +01:00
clauspeterhuebner	5a8a0a4177	Merge branch 'master' into 2730-devops-add-federation-modul-to-deployment-scripts	2023-03-09 14:26:06 +01:00
Hannes Heine	4fa00b728e	Merge branch 'master' into 2787-fix-contribution-tab-textes	2023-03-09 13:44:24 +01:00
Hannes Heine	15e092b428	Merge pull request #2798 from gradido/fix-info-svg ... fix(frontend): info.svg	2023-03-09 13:43:55 +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
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