7731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	5419ff6616	Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area	2022-03-30 16:46:10 +02:00
ogerly	842b1a03cd	change gradient color for button variant gradido	2022-03-30 16:41:27 +02:00
ogerly	dd6fce18e1	change auth area pages for auth-templates	2022-03-30 16:40:42 +02:00
ogerly	4b4ab225a1	change router links in nav-link	2022-03-30 16:38:53 +02:00
ogerly	fac552edc9	add language switch in text	2022-03-30 16:37:17 +02:00
ogerly	747af3b42f	change layout template for auth area	2022-03-30 16:36:44 +02:00
ogerly	f3cbc8c2a7	add image gradido coin	2022-03-30 16:35:50 +02:00
ogerly	de13e2f747	remove unused components and layouts for auth	2022-03-30 16:34:26 +02:00
Alexander Friedland	9ce0229345	Merge pull request #1687 from gradido/1684-when-generating-a-link-form-does-not-reset ... 1684 when generating a link form does not reset	2022-03-30 10:11:02 +02:00
ogerly	40c7f96b20	remove onReset in created, add EMPTY_TRANSACTION_DATA in send function	2022-03-30 08:07:32 +02:00
ogerly	d013bd9de1	set function onReset on created components for clear form	2022-03-30 08:00:30 +02:00
ogerly	6818b52e3e	add texte and change style for AuthLogin	2022-03-30 06:55:13 +02:00
ogerly	15c8dc6d37	change style for AuthTemplate left side	2022-03-30 06:54:34 +02:00
Ulf Gebhardt	902d45e8d2	Merge pull request #1679 from gradido/mass_creation_do_not_show_unactivated ... Refactor: Multicreation - do not show unactivated emails	2022-03-29 20:39:30 +02:00
Ulf Gebhardt	10ae00dba8	Merge branch 'master' into mass_creation_do_not_show_unactivated	2022-03-29 20:31:05 +02:00
Moriz Wahl	eeb5af9249	Merge pull request #1663 from gradido/show-valid-time-of-link-in-email ... feat: Show Link Duration in Emails	2022-03-29 20:30:55 +02:00
Moriz Wahl	1db61b3efd	Merge branch 'master' into show-valid-time-of-link-in-email	2022-03-29 20:22:20 +02:00
Moriz Wahl	5608937d75	Merge pull request #1665 from gradido/refactor-balance-resolver ... refactor: Balance Resolver	2022-03-29 20:22:08 +02:00
Moriz Wahl	07ad22b71d	change function name to print time duration	2022-03-29 20:10:00 +02:00
Moriz Wahl	a38a7889a3	Merge branch 'master' into refactor-balance-resolver	2022-03-29 19:59:12 +02:00
Moriz Wahl	abd58ab9cf	new config version	2022-03-29 19:58:12 +02:00
Moriz Wahl	8d1eff0765	new config version	2022-03-29 19:57:52 +02:00
Moriz Wahl	a4b30b385f	Merge branch 'master' into show-valid-time-of-link-in-email	2022-03-29 19:49:24 +02:00
Moriz Wahl	4139a931a3	Merge pull request #1662 from gradido/optin-valid-time ... refactor: Set Email Optin Valid Time to 24 hours	2022-03-29 19:49:09 +02:00
Moriz Wahl	b3002027cd	new backend version in env dist	2022-03-29 19:38:12 +02:00
ogerly	c0878bf1a4	add setAuthItem	2022-03-29 17:05:41 +02:00
ogerly	14942363f5	add style imputs and selects	2022-03-29 17:04:41 +02:00
ogerly	cdc98c63a7	add height 100%	2022-03-29 17:03:59 +02:00
ogerly	0b215954ba	add slots AuthItem, add templates auth components	2022-03-29 17:02:57 +02:00
Moriz Wahl	43242c98b4	Merge branch 'master' into refactor-balance-resolver	2022-03-29 16:15:33 +02:00
Moriz Wahl	90e6798a7d	rename context.count to context.transactionCount	2022-03-29 16:10:06 +02:00
Moriz Wahl	0c5719140d	Merge branch 'master' into optin-valid-time	2022-03-29 16:05:56 +02:00
Ulf Gebhardt	1cdb526669	fixed test to properly check the filters on Admin UserSearch	2022-03-29 12:50:13 +02:00
Ulf Gebhardt	d95e4d864a	Merge branch 'master' into mass_creation_do_not_show_unactivated	2022-03-29 12:43:13 +02:00
ogerly	160ee30b7d	add import ResetPassword ForgotPassword	2022-03-29 12:37:22 +02:00
ogerly	8564ecb818	add component auth ResetPassword	2022-03-29 12:36:54 +02:00
ogerly	8595633825	add component auth ForgotPassword	2022-03-29 12:36:17 +02:00
Ulf Gebhardt	a5d485ee41	Merge pull request #1683 from gradido/fixes_stage1 ... Fix: Fixes found on Stage1	2022-03-29 12:27:02 +02:00
Ulf Gebhardt	e5cdb3d7b1	Merge branch 'master' into fixes_stage1	2022-03-29 11:43:21 +02:00
ogerly	cc74dd87f2	remove unused dropdown items	2022-03-29 11:42:32 +02:00
ogerly	c70aaa3455	change button variant to gradido and outline-gradido	2022-03-29 11:41:25 +02:00
ogerly	3d1f4f96e7	change welcome text, unused bg image	2022-03-29 11:40:24 +02:00
ogerly	655700e9f9	change size from Blaetter.png	2022-03-29 11:13:24 +02:00
ogerly	cdc9f938b8	add button variant gradido, outline-gradido	2022-03-29 11:09:45 +02:00
Alexander Friedland	9264a6eb2b	Merge pull request #1656 from gradido/1555-Admin-see-user-generated-link ... 1555 admin see user generated link	2022-03-29 09:00:36 +02:00
Moriz Wahl	667b964d37	coverage backend to 55%	2022-03-29 02:59:25 +02:00
Moriz Wahl	8fd93ff853	remove test for remove optin from DB after email verification	2022-03-29 02:58:36 +02:00
Moriz Wahl	633eef7c16	round GDD values in balance object	2022-03-29 02:34:13 +02:00
Moriz Wahl	feb89cf4e0	import transaction as db transaction	2022-03-29 01:58:20 +02:00
Moriz Wahl	51258b838e	set rights correctly	2022-03-29 01:55:59 +02:00