5569 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	e23180896f	merge 1165-Admin-issues-regarding-code-quality-syle	2021-12-19 13:07:02 +01:00
ogerly	d13b341bae	Switching between two form additions is clean	2021-12-19 13:03:34 +01:00
ogerly	bb703f9fa8	clean code from creation or confirm registermail formular	2021-12-19 12:58:22 +01:00
ogerly	2ea0a18075	show an hide creation or confirm registermail formular	2021-12-19 12:56:58 +01:00
ogerly	cfc502593d	add cell confirm_mail, mail icon in Usertabel Usersearch	2021-12-19 11:59:37 +01:00
ogerly	02a211a7fe	code tidy, yarn lint	2021-12-19 10:45:58 +01:00
ogerly	49fa943063	only have one creation form box open at a time.	2021-12-19 10:44:38 +01:00
ogerly	147e3c18b9	row.detailsShowing clearing, remove console.logs	2021-12-18 21:39:43 +01:00
Alexander Friedland	21f884bb87	Merge branch 'master' into 1165-Admin-issues-regarding-code-quality-syle	2021-12-18 21:02:15 +01:00
ogerly	a46d1acce7	show details of a user only once in the table. close open details automatically	2021-12-18 17:15:11 +01:00
Hannes Heine	543c32cabe	Merge branch 'master' into 1196-send-registration-link	2021-12-18 11:41:23 +01:00
ogerly	6e9b65b6e0	close all showDetails prepared	2021-12-17 13:22:16 +01:00
Alexander Friedland	fe6f093847	Merge pull request #1149 from gradido/1078-GDD-Calculate-Decay-Tool-clear ... 1057 display gdd balance when sending	2021-12-17 13:17:40 +01:00
Alexander Friedland	96e5362cb4	Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear	2021-12-17 12:23:10 +01:00
elweyn	ffe3cdf700	Config of resendTime to resendPassword logic	2021-12-17 11:12:52 +01:00
elweyn	da527dd162	Database logics when resending activation link	2021-12-17 11:04:12 +01:00
elweyn	7f650b9755	Adding a configurable resend_time in minutes.	2021-12-17 11:01:23 +01:00
elweyn	8c5fff73ef	Refactoring of the sendActivationEmail so that we can send another email with a new activation link.	2021-12-17 09:49:45 +01:00
elweyn	238352bf24	Change the removeConfirmResult so we switch over the event possibilities instead of an if else logic.	2021-12-17 09:05:24 +01:00
Hannes Heine	fedd1d626d	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-17 08:47:59 +01:00
Hannes Heine	523696748a	Merge pull request #1164 from gradido/1145-refactor-admin-resolver-from-master ... 1145 refactor admin resolver from master	2021-12-16 20:06:12 +01:00
ogerly	8545e27a23	change color in navbar for open creations	2021-12-16 17:14:48 +01:00
ogerly	a4a51fbf9d	yarn lint --fix	2021-12-16 17:08:02 +01:00
ogerly	ab5baf00d4	unused elements removed	2021-12-16 17:06:02 +01:00
Alexander Friedland	d87c6f3b07	Merge branch 'master' into Docu-Template-Overview-2021	2021-12-16 14:08:47 +01:00
Hannes Heine	6ba0c16776	Merge branch 'master' into 1145-refactor-admin-resolver-from-master	2021-12-16 13:00:01 +01:00
Alexander Friedland	b846fac6ed	Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear	2021-12-16 12:53:42 +01:00
Alexander Friedland	ef50176ba0	Merge pull request #1183 from gradido/Error-handling-in-GddTransactionList ... Error handling in GddTransactionList.vue	2021-12-16 12:52:55 +01:00
Ulf Gebhardt	8edd750912	fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired	2021-12-16 12:30:04 +01:00
elweyn	52acec0820	Tests for SendOverview send transaction steps	2021-12-16 12:11:16 +01:00
ogerly	de7549596e	error query set individually	2021-12-16 09:45:51 +01:00
ogerly	c909730357	Templat-Overview-16-12-2021/Template-Overview-2021.pdf	2021-12-16 08:57:53 +01:00
Ulf Gebhardt	9b45844bd5	Merge branch 'master' into catch-no-cookies	2021-12-15 12:06:19 +01:00
Alexander Friedland	ab3b4f40bb	Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-15 07:55:34 +01:00
Alexander Friedland	d1de2b5820	Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-15 07:55:17 +01:00
Alexander Friedland	ca0f122f4e	Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-15 07:55:08 +01:00
Moriz Wahl	03d7e0231f	link to github support page	2021-12-14 15:01:10 +01:00
Moriz Wahl	e89ac1eca0	remove emaca backup of README	2021-12-14 14:53:52 +01:00
Moriz Wahl	dc6a3a4caa	simple README for support	2021-12-14 14:52:47 +01:00
Alexander Friedland	ada332e8a2	Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear	2021-12-14 13:05:05 +01:00
ogerly	725e5a29e9	add propsData in SendOverview.spec.js, yarn lint --fix	2021-12-14 12:48:24 +01:00
ogerly	17d16df87c	yarn locales --fix	2021-12-14 11:24:56 +01:00
ogerly	e03534108e	Status component removed from SendOverview	2021-12-14 11:24:04 +01:00
ogerly	00c2c85306	Send transaction confirm, new amount structured	2021-12-14 11:22:30 +01:00
Alexander Friedland	4530e53ce7	Merge branch 'master' into Error-handling-in-GddTransactionList	2021-12-14 10:01:28 +01:00
ogerly	1cc35170e9	yarn lint --fix	2021-12-14 09:48:12 +01:00
ogerly	6ab394d46f	english translations for the test	2021-12-14 09:47:37 +01:00
ogerly	4cfd2206fe	test no transactions, test transaction is empty	2021-12-14 09:44:52 +01:00
Alexander Friedland	0818ddcf66	Update frontend/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-14 09:12:49 +01:00
Alexander Friedland	96dc03e0df	Update frontend/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-14 09:12:40 +01:00