7732 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	04affc5a7d	Merge pull request #1698 from gradido/v1.7.0 ... v1.7.0	2022-03-30 20:53:05 +02:00
Ulf Gebhardt	014306574d	v1.7.0	2022-03-30 20:42:56 +02:00
Alexander Friedland	a1781429a6	Merge pull request #1694 from gradido/STYLE-docu-folder-template-images ... folder for new style images	2022-03-30 20:40:17 +02:00
Alexander Friedland	2aebbdf896	Merge branch 'master' into STYLE-docu-folder-template-images	2022-03-30 20:31:56 +02:00
Moriz Wahl	5481bd0a17	Merge pull request #1696 from gradido/fix-no-email-exposed-on-forgot-password ... fix: No Email Exposed on Forgot Password	2022-03-30 20:31:29 +02:00
Alexander Friedland	65f49ff7b9	Merge branch 'master' into STYLE-docu-folder-template-images	2022-03-30 20:28:56 +02:00
Moriz Wahl	3ad9685a82	Merge branch 'master' into fix-no-email-exposed-on-forgot-password	2022-03-30 20:22:44 +02:00
Moriz Wahl	7193d5fac6	Merge pull request #1692 from gradido/no-decay-calculation-in-frontend ... fix: No Decay Calculation in Frontend	2022-03-30 20:22:33 +02:00
Moriz Wahl	9ede8e5c49	Merge branch 'master' into no-decay-calculation-in-frontend	2022-03-30 20:04:05 +02:00
Moriz Wahl	3016bd66ec	Merge pull request #1691 from gradido/fix-wrong-decay-transaction-balance ... fix: Wrong Balance on Decay Transaction	2022-03-30 20:03:51 +02:00
Alexander Friedland	020bf78be9	Merge branch 'master' into STYLE-docu-folder-template-images	2022-03-30 19:59:40 +02:00
Moriz Wahl	1a76409a48	Merge branch 'master' into fix-wrong-decay-transaction-balance	2022-03-30 19:52:32 +02:00
Moriz Wahl	c9e609db6e	Merge pull request #1689 from gradido/no-plus-on-zero-decay ... fix: No Plus Before Zero Decay	2022-03-30 19:52:20 +02:00
Moriz Wahl	3495726987	Merge branch 'master' into no-plus-on-zero-decay	2022-03-30 19:42:27 +02:00
Moriz Wahl	533fe5fc72	Merge pull request #1688 from gradido/update-deployment-env ... fix: Update Deployment env.dist	2022-03-30 19:40:25 +02:00
Moriz Wahl	749b9c38c3	toast an error when forgot password fails	2022-03-30 18:33:46 +02:00
Moriz Wahl	ef3420ef2e	add standerd error message on fail for forgot password API call	2022-03-30 18:33:26 +02:00
Moriz Wahl	3078315286	change name and tpye of query sendResetPasswordEmail to mutation forgotPassword. Do not throw when email is not found	2022-03-30 18:24:44 +02:00
Moriz Wahl	d4415ee256	use renamed mutation instead of badly named query	2022-03-30 18:22:49 +02:00
Moriz Wahl	a0eb707375	change name of mutation which was wrongly called as query	2022-03-30 18:21:52 +02:00
ogerly	f30be03c5b	folder for new style images	2022-03-30 16:57:13 +02:00
Moriz Wahl	fda507c54c	add balance to transaction objects created for pagination tests	2022-03-30 16:08:36 +02:00
Moriz Wahl	19a26d5fb7	add required prop previous booked balance tp specs	2022-03-30 16:02:57 +02:00
Moriz Wahl	ef17acc72d	add previous booked balance prop to all transaction types, rename components	2022-03-30 15:58:59 +02:00
Moriz Wahl	0ab4f73f3b	subtract the hold available amount from last transaction balance for virtual decay transaction	2022-03-30 15:10:36 +02:00
Moriz Wahl	dc09a0ccf6	get balance of previous transaction to avoid decay calculation	2022-03-30 15:03:54 +02:00
Moriz Wahl	20a1c08c05	Merge branch 'master' into update-deployment-env	2022-03-30 14:19:01 +02:00
Moriz Wahl	6449924e80	fix: No plus before zero decay	2022-03-30 14:13:35 +02:00
Moriz Wahl	1902bb9864	add email configs	2022-03-30 14:00:16 +02:00
Moriz Wahl	5b10a87071	update env template	2022-03-30 13:59:55 +02:00
Moriz Wahl	6cc710b62c	default publisher id in env template	2022-03-30 13:51:25 +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
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
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