7801 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	8bbe9401b0	Merge branch 'master' into 1588-frontend-show-link-information	2022-03-21 13:08:48 +01:00
ogerly	58a7bc0e2a	delete redeem	2022-03-21 13:08:11 +01:00
ogerly	12f2f2845a	remove store redeem and add params code	2022-03-21 13:05:31 +01:00
Hannes Heine	5dc903bfb1	Merge pull request #1336 from gradido/1319-email-optin ... Change the text if the account is not activated yet and changed the b…	2022-03-21 12:54:20 +01:00
elweyn	ed1c3bf137	Withdrew else block after throwing an error.	2022-03-21 12:44:03 +01:00
Ulf Gebhardt	c83959fc58	Merge branch 'master' into 1319-email-optin	2022-03-21 12:30:57 +01:00
ogerly	042741a9aa	add code to push	2022-03-21 12:11:59 +01:00
ogerly	6d257825e2	add redeemCode to login button	2022-03-21 12:11:19 +01:00
ogerly	cdd13cf24e	add params on thx and checkEmail	2022-03-21 12:09:07 +01:00
ogerly	a23777b6ec	uncomment code activationLink	2022-03-21 12:07:59 +01:00
ogerly	15e0186381	add redeemCode on register process for createUser	2022-03-21 10:54:56 +01:00
ogerly	3992882962	add redeemCode on UserResolver.ts	2022-03-21 10:29:56 +01:00
ogerly	1f1cd67b9e	add redeemCode	2022-03-21 10:29:13 +01:00
ogerly	6c87a6f32a	changed code from store to param	2022-03-21 10:28:12 +01:00
ogerly	2fb5cf2d81	delete redeemCode from store	2022-03-21 10:27:14 +01:00
ogerly	bf915a9668	add components RedeemInformation.vue	2022-03-21 10:09:28 +01:00
ogerly	837850c17e	change order name from LinkInformatins to LinkInformations	2022-03-21 08:24:48 +01:00
ogerly	9c668f3934	changed review from moriz	2022-03-21 08:18:47 +01:00
ogerly	a14f98e4ee	test frontend/src/store/store.test.js ok	2022-03-21 08:18:47 +01:00
Alexander Friedland	99575cc2f5	Update frontend/src/pages/ShowTransactionLinkInformations.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-21 08:13:34 +01:00
Alexander Friedland	3a2d7acd29	Update frontend/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-21 08:08:48 +01:00
Alexander Friedland	7210804a72	Merge branch 'master' into 1588-frontend-show-link-information	2022-03-20 19:11:28 +01:00
Moriz Wahl	384fd12b63	change parameter name to code	2022-03-20 19:00:36 +01:00
Moriz Wahl	e9357198c0	change parameter name to code	2022-03-20 18:58:20 +01:00
ogerly	d90284a269	add store.state and store.commit redeemCode, add store.commit in register	2022-03-20 13:39:11 +01:00
ogerly	3f76db7f21	add method redeemLink, add text that shows the code in the formular	2022-03-20 11:42:16 +01:00
ogerly	6829d7eeac	add method redeemLink, add text that shows the code in the formular	2022-03-20 11:40:11 +01:00
ogerly	7996bc8e5c	add computed parameters for register and login (add code)	2022-03-20 11:37:53 +01:00
ogerly	0132d95cf8	remove props id and delete id from emit	2022-03-20 11:36:16 +01:00
ogerly	d3352ff0bf	add successfully-redeemed	2022-03-20 11:34:41 +01:00
ogerly	283a9d751b	change variable id to code	2022-03-20 11:33:15 +01:00
ogerly	5695427392	add optional parameter code to login and register	2022-03-20 11:30:02 +01:00
ogerly	980d3ee527	change parameter id to code	2022-03-20 11:26:22 +01:00
ogerly	1315ab4fa0	change parameter id from Int to String	2022-03-20 11:25:18 +01:00
ogerly	4e013ce9be	change data linkData in all files	2022-03-20 09:31:02 +01:00
ogerly	7da8b4812b	change displaySetup to linkData	2022-03-20 09:29:14 +01:00
ogerly	ec5151c42c	change color link information box	2022-03-20 09:13:12 +01:00
Moriz Wahl	7dfa0e37ee	fix: id parameter to Int in seed	2022-03-19 13:08:37 +01:00
Moriz Wahl	612b8ca69c	Merge branch 'master' into no-float-ids	2022-03-19 13:07:53 +01:00
Moriz Wahl	7f6b7482b0	Int as arg type for ID	2022-03-19 12:35:34 +01:00
Moriz Wahl	8038f1bf9b	include deleted links	2022-03-19 12:29:43 +01:00
Ulf Gebhardt	5963251085	Merge pull request #1628 from gradido/rename_transaction_type_link_summary ... Refactor: Corrected name of transaction link summary	2022-03-19 12:25:35 +01:00
Ulf Gebhardt	761de3f636	corrected name of transaction link summary to differentiate between a link and the summary transaction	2022-03-19 10:43:17 +01:00
ogerly	7a117d224f	test 100% for src/routes/router.test.js	2022-03-18 20:27:32 +01:00
ogerly	cc77a0122f	test 100% for NotFoundPage.spec.js	2022-03-18 20:22:27 +01:00
ogerly	1d8f94671f	change container margin top to 4	2022-03-18 20:22:27 +01:00
ogerly	f25ab05ec0	change bg-variant to muted, border-variant to info	2022-03-18 20:22:27 +01:00
Alexander Friedland	ffb5ff73ce	Merge branch 'master' into 1588-frontend-show-link-information	2022-03-18 19:54:35 +01:00
ogerly	18a650c95a	change tests for ShowTransactionLinkInformations.spec.js	2022-03-18 19:38:57 +01:00
ogerly	668d4f05e0	yarn locales && lint --fix	2022-03-18 19:25:12 +01:00