7205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	6be7990142	mising space	2022-02-14 16:42:59 +01:00
Ulf Gebhardt	a62b7e0d28	cancel hook on certain events before calculating data ... ensure all required fields are present and cancel when thats not the case	2022-02-14 16:39:19 +01:00
Moriz Wahl	22c408f633	fix: Catch GDT Server Errors	2022-02-14 14:34:43 +01:00
Ulf Gebhardt	d433d7df9f	Merge pull request #1478 from gradido/v1.6.4 ... v1.6.4	2022-02-14 14:06:56 +01:00
Ulf Gebhardt	b2bf3457f9	v1.6.4	2022-02-14 14:00:56 +01:00
Moriz Wahl	a503a4d456	Merge pull request #1448 from gradido/admin-email-confirmation ... fix: Admin Email Confirmation Date and Time	2022-02-14 13:54:19 +01:00
Ulf Gebhardt	f3b3fa2eba	do not query on email opt in type, since we have different ones and legacy types. Furthermore order the result of the query.	2022-02-14 13:45:48 +01:00
Moriz Wahl	1e6e056dcd	Merge branch 'master' into admin-email-confirmation	2022-02-14 13:20:53 +01:00
Ulf Gebhardt	f70f028136	Merge pull request #1477 from gradido/fix_do_not_log_password_and_token ... Fix: Do not log password or token to the console	2022-02-14 13:11:55 +01:00
Moriz Wahl	70fd858cf8	Merge branch 'master' into admin-email-confirmation	2022-02-14 13:10:44 +01:00
Moriz Wahl	a201cad0db	use lodash clonedeep to copy objects	2022-02-14 12:57:24 +01:00
Ulf Gebhardt	760b7e2d01	renamed data2 to dataCopy	2022-02-14 10:24:06 +01:00
Ulf Gebhardt	820cdfb16f	do not log password and token to the console	2022-02-14 09:51:06 +01:00
Ulf Gebhardt	54159d910d	Merge pull request #1474 from gradido/fix_elopage_hook_crash ... Fix: Elopage Hook Crash	2022-02-14 08:43:24 +01:00
Ulf Gebhardt	14dfb22593	corrected database version	2022-02-14 08:32:06 +01:00
Ulf Gebhardt	6d732374c5	missing entity definition	2022-02-13 23:04:43 +01:00
Moriz Wahl	a79f1067ef	Merge branch 'master' into admin_user_search_optimization	2022-02-13 15:08:14 +01:00
einhornimmond	84d7f17d85	Update backend/src/typeorm/repository/User.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-13 13:33:44 +01:00
Ulf Gebhardt	1a1e011e6d	null fields when there is no valid integer arriving from elopage. ... Furthermore try catch on save to prevent server crashes	2022-02-13 12:41:16 +01:00
Ulf Gebhardt	65f76f82ed	migrate database to accept null on all parseInt fields on elopageBuys	2022-02-13 12:40:37 +01:00
Einhornimmond	692433ce51	try fix linting	2022-02-13 09:22:05 +01:00
Einhornimmond	cdd31ccba9	fix nested where conditions	2022-02-12 12:41:13 +01:00
Moriz Wahl	bbd90b8314	Merge branch 'master' into admin-email-confirmation	2022-02-12 07:52:03 +01:00
Alexander Friedland	93484425b9	Merge branch 'master' into 1459-List-Data-again-on-Confirm-Creation	2022-02-11 17:15:18 +01:00
Alexander Friedland	c4942799b8	Merge pull request #1455 from gradido/538-Unify-all-buttons ... 538 unify all buttons	2022-02-11 17:06:21 +01:00
ogerly	a562b3cdd1	remove unused code, set corectly function	2022-02-11 16:58:15 +01:00
ogerly	9433813608	merge master, resolve conflict	2022-02-11 16:54:43 +01:00
ogerly	19e5cd196d	add Overlay.spec.js	2022-02-11 16:30:23 +01:00
Moriz Wahl	15a9af4552	Merge branch 'master' into admin-email-confirmation	2022-02-11 16:29:05 +01:00
Alexander Friedland	7408a90a68	Merge branch 'master' into 538-Unify-all-buttons	2022-02-11 16:21:22 +01:00
Alexander Friedland	2963306b9e	Merge pull request #1460 from gradido/833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful ... 833 old error is shown for a second even if transaction is successful	2022-02-11 16:20:19 +01:00
Alexander Friedland	03dcdf5100	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-11 16:18:25 +01:00
Alexander Friedland	e722054c50	Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-11 16:15:19 +01:00
Alexander Friedland	623d19e57c	Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-11 16:15:07 +01:00
Alexander Friedland	fea89a0ac7	Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-11 16:14:55 +01:00
Alexander Friedland	e607645fe3	Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-11 16:14:45 +01:00
ogerly	2ac912d584	yarn lint --fix	2022-02-11 15:31:39 +01:00
ogerly	78064c49f3	changes in the order of the data	2022-02-11 15:30:35 +01:00
Moriz Wahl	d3136adf33	linting	2022-02-11 15:27:23 +01:00
Moriz Wahl	8796e683d7	Merge branch 'master' into 833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful	2022-02-11 15:25:53 +01:00
ogerly	82f3c0d580	datetime add for creation month	2022-02-11 15:22:10 +01:00
Moriz Wahl	95c6a5594f	Merge branch 'master' into 538-Unify-all-buttons	2022-02-11 15:16:39 +01:00
ogerly	a87874ea9a	yarn locale --fix	2022-02-11 15:09:27 +01:00
ogerly	7834054a77	add components Overlay.vue, add localize for Overlay.vue	2022-02-11 15:08:09 +01:00
Moriz Wahl	e9149d9644	Merge branch 'master' into admin-email-confirmation	2022-02-11 15:05:06 +01:00
Moriz Wahl	5dafcb6890	Merge pull request #1446 from gradido/fix-email-spelling ... fix: Wrong Email Spelling in German	2022-02-11 15:04:52 +01:00
Moriz Wahl	14373ff302	Merge branch 'master' into admin-email-confirmation	2022-02-11 15:03:29 +01:00
Moriz Wahl	ec42f7239e	Merge branch 'master' into fix-email-spelling	2022-02-11 14:56:37 +01:00
Moriz Wahl	6cce2cf7ac	Merge pull request #1445 from gradido/fix-redirect-after-register ... fix: Redirect to Login after Register	2022-02-11 14:56:23 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00