2093 Commits

Author	SHA1	Message	Date
ogerly	4675c56790	test router.test.js fixed	2022-03-21 21:38:28 +01:00
Alexander Friedland	32d8cf4a9d	Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:25:41 +01:00
Moriz Wahl	be8e3f489e	test with param code	2022-03-21 16:37:44 +01:00
Moriz Wahl	5baa14b359	test transaction link page	2022-03-21 16:25:17 +01:00
ogerly	2ea7cf6705	merge #1588 and resolve conflicts	2022-03-21 14:57:43 +01:00
Moriz Wahl	c57b40adc1	test Register with Redeem Code	2022-03-21 14:56:37 +01:00
Moriz Wahl	44f8155755	Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information	2022-03-21 14:54:53 +01:00
ogerly	ea99db0159	yarn lint and locales fixed	2022-03-21 14:50:50 +01:00
ogerly	9377102f00	deleted v-else	2022-03-21 14:46:14 +01:00
ogerly	f8882fa63a	remove computed	2022-03-21 14:41:50 +01:00
Moriz Wahl	8bfe350026	Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information	2022-03-21 14:39:49 +01:00
ogerly	7850127ae2	after login go to redeem page	2022-03-21 14:38:19 +01:00
Moriz Wahl	17bfbd6281	fix test for optional code on login on register	2022-03-21 14:29:00 +01:00
Alexander Friedland	c2d0b566a8	Update frontend/src/locales/de.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-03-21 14:05:41 +01:00
ogerly	b68fab72cc	review from ulf and hannes	2022-03-21 14:02:04 +01:00
Alexander Friedland	e41f594fbd	Update frontend/src/locales/de.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-03-21 13:50:50 +01:00
Alexander Friedland	db0297b826	Update frontend/src/locales/de.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-03-21 13:50:35 +01:00
Alexander Friedland	be319ba5e4	Update frontend/src/locales/en.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-03-21 13:50:17 +01:00
Alexander Friedland	07bf90e483	Update frontend/src/locales/en.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-03-21 13:49:19 +01:00
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
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	15e0186381	add redeemCode on register process for createUser	2022-03-21 10:54:56 +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	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	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	7f6b7482b0	Int as arg type for ID	2022-03-19 12:35:34 +01:00