7079 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	d4adb3b682	Revert change so that if the timeElapsed is less or equal to the max time their is no new email that is send.	2022-03-15 08:26:38 +01:00
elweyn	f2e2c2d708	Withdrew resetFailed block since it redirects directly to the forgot-password page.	2022-03-15 08:24:22 +01:00
elweyn	09c215bd50	Change Error message formating.	2022-03-15 08:19:27 +01:00
elweyn	ce0cc2c1b7	Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin	2022-03-15 08:16:32 +01:00
elweyn	04bb502255	Change the logic get EMAIL_CODE_VALID_TIME config	2022-03-15 08:16:27 +01:00
Hannes Heine	161f079a9b	Update frontend/src/locales/en.json ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:17:47 +01:00
Hannes Heine	e16eb80119	Update frontend/src/locales/de.json ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:17:03 +01:00
Hannes Heine	506df5268a	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:15:42 +01:00
Hannes Heine	5e25e5c8eb	Merge branch 'master' into 1319-email-optin	2022-03-14 16:15:14 +01:00
Hannes Heine	82e453c27b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:14:52 +01:00
Ulf Gebhardt	057814e17a	Merge pull request #1612 from gradido/fix_logrotate ... Fix: Logrotate & Log Dates & Save Update Log & Correct tag Checkout	2022-03-14 15:47:59 +01:00
Ulf Gebhardt	b91237d2af	Merge branch 'master' into fix_logrotate	2022-03-14 15:20:38 +01:00
Moriz Wahl	1a8ef0085b	Merge pull request #1616 from gradido/no-reset-db-in-unit-tests ... refactor: No Reset DB in Backend Unit Tests	2022-03-14 15:20:07 +01:00
Ulf Gebhardt	1b1510a70f	Update deployment/bare_metal/start.sh ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-14 15:00:37 +01:00
Moriz Wahl	87bd89ec74	Update .github/workflows/test.yml ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 14:58:37 +01:00
Moriz Wahl	0aa9e290d9	wait for mariadb to start	2022-03-14 13:52:52 +01:00
Moriz Wahl	9e7440e75d	Merge branch 'master' into no-reset-db-in-unit-tests	2022-03-14 13:05:48 +01:00
elweyn	2d4411d390	Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin	2022-03-14 12:49:43 +01:00
elweyn	ac3340ec1c	Change RESEND_TIME config name to EMAIL_CODE_VALID_TIME.	2022-03-14 12:49:34 +01:00
Hannes Heine	e410fccd86	Merge branch 'master' into 1319-email-optin	2022-03-14 12:43:11 +01:00
elweyn	c975ac0aa2	Add apollo query mock to the ResetPassword.spec.js so that the success case is taken in account, TODO: Test for error case.	2022-03-14 12:42:18 +01:00
Ulf Gebhardt	a78ad24c7e	Merge branch 'master' into fix_logrotate	2022-03-14 12:41:33 +01:00
Ulf Gebhardt	e97bcd4d20	Update deployment/bare_metal/start.sh ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-14 12:41:25 +01:00
Ulf Gebhardt	3a52a3892a	Update deployment/bare_metal/start.sh ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-14 12:41:19 +01:00
Ulf Gebhardt	3e25268c32	Update deployment/bare_metal/start.sh ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-14 12:41:13 +01:00
Ulf Gebhardt	fef247ed53	Merge pull request #1611 from gradido/coverage_backend ... Test: Require 53% backend coverage	2022-03-14 12:38:50 +01:00
elweyn	00a1ed9e11	Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin	2022-03-14 12:34:13 +01:00
elweyn	21504e8005	Add query to the queries file, add method that checks if optin code is valid else push to password reset page.	2022-03-14 12:33:57 +01:00
elweyn	4105191b04	RIGHTS for the query.	2022-03-14 12:33:10 +01:00
elweyn	c3f7953bdb	Create a query to check if OptIn code is not to old.	2022-03-14 12:32:42 +01:00
Hannes Heine	2b9214316c	Merge branch 'master' into 1319-email-optin	2022-03-14 11:35:30 +01:00
Moriz Wahl	d0df7002f9	add dependency database_migration_test to backend unit tests, do not wait anymore	2022-03-14 10:25:12 +01:00
Moriz Wahl	a503815829	wait again	2022-03-14 10:19:36 +01:00
Moriz Wahl	4db0235738	await for the connection to close	2022-03-14 10:19:19 +01:00
Moriz Wahl	ec1322c5ed	try backend unit tests in CI without sleeps	2022-03-14 10:15:01 +01:00
Moriz Wahl	dedf174f4f	add dependency database_up to backend unit tests	2022-03-14 10:12:56 +01:00
Moriz Wahl	85ca10f000	refactor: No Reset DB in Backend Unit Tests	2022-03-14 10:10:57 +01:00
Ulf Gebhardt	21848c2b1c	reference build folders in moduleAliases	2022-03-12 04:06:03 +01:00
Ulf Gebhardt	549f218231	module-aliases in order to have things working with NODE_ENV=production	2022-03-12 03:52:01 +01:00
Ulf Gebhardt	45068d512c	tee append	2022-03-12 03:17:46 +01:00
Ulf Gebhardt	2975efe58f	try appending to logfile with new method	2022-03-12 03:14:35 +01:00
Ulf Gebhardt	0885938bda	removed comment	2022-03-12 03:12:22 +01:00
Ulf Gebhardt	15219001b1	try ussing tee for proper logoutput in console and file	2022-03-12 03:08:45 +01:00
Ulf Gebhardt	6b2664e6ef	add another newline	2022-03-12 03:05:36 +01:00
Ulf Gebhardt	b5ddd0359b	use <pre> tag	2022-03-12 03:03:16 +01:00
Ulf Gebhardt	cf36ab72ee	fetch all for tag compatibility	2022-03-12 02:55:27 +01:00
Ulf Gebhardt	61e5ed2878	date for log files ... save update log	2022-03-12 02:47:45 +01:00
Ulf Gebhardt	afb54b885b	only rotate logfiles	2022-03-12 02:10:04 +01:00
Ulf Gebhardt	982ef13ec8	require 53% coverage on backend	2022-03-12 02:00:45 +01:00
Alexander Friedland	93e70c0aac	Merge pull request #1600 from gradido/1599-components-for-transactionlist-types ... 1599 components for transactionlist types	2022-03-11 17:30:10 +01:00