913 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	b2bf3457f9	v1.6.4	2022-02-14 14:00:56 +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
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	14dfb22593	corrected database version	2022-02-14 08:32:06 +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
Moriz Wahl	15a9af4552	Merge branch 'master' into admin-email-confirmation	2022-02-11 16:29:05 +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
Moriz Wahl	e9149d9644	Merge branch 'master' into admin-email-confirmation	2022-02-11 15:05:06 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00
ogerly	5319f6de1e	remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 12:10:00 +01:00
Moriz Wahl	566a8a2af0	Merge branch 'master' into fix-email-spelling	2022-02-10 08:38:53 +01:00
Moriz Wahl	0a545c5fbe	fix missing negator	2022-02-10 08:14:58 +01:00
Moriz Wahl	b3be4f664a	add date of last email confirmation send to admin user	2022-02-10 08:05:25 +01:00
Moriz Wahl	2c88bc0383	remove query for checkEmail as it is included in the user model now	2022-02-10 07:32:39 +01:00
Ulf Gebhardt	275ca14692	v1.6.3	2022-02-09 19:37:52 +01:00
Moriz Wahl	32fdd77ac7	fix: Wrong Email Spelling in German	2022-02-09 12:23:07 +01:00
Ulf Gebhardt	0b874235a9	v1.6.2	2022-02-08 16:29:18 +01:00
Ulf Gebhardt	ee94c655ef	fix elopage buys not using repository but entity	2022-02-08 15:59:59 +01:00
Alexander Friedland	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +01:00
Ulf Gebhardt	b04445c13d	Merge branch 'master' into fix_community_name_description	2022-02-07 19:57:07 +01:00
Alexander Friedland	8a04d2be51	Merge branch 'master' into fix_community_name_description	2022-02-07 17:04:52 +01:00
Ulf Gebhardt	8e769e7b0e	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 13:07:55 +01:00
elweyn	d502b3d052	yarn lint --fix.	2022-02-07 13:05:06 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
ogerly	4dc4f30097	Add hasElopage to the UserAdmin model.	2022-02-07 10:39:01 +01:00
ogerly	3806beb01e	Add hasElopage flag to user entity for the admin user search.	2022-02-07 10:38:35 +01:00
ogerly	555420a568	Remove unused imports, extract hasElopageBuys to utility.	2022-02-07 10:36:43 +01:00
ogerly	9d79e35f36	Refactor hasElopageBuys method to a utility method.	2022-02-07 10:34:54 +01:00
Ulf Gebhardt	c6e2d2cf1c	updated version string	2022-02-07 07:57:14 +01:00
Ulf Gebhardt	8e922a6d1a	unsaved file	2022-02-07 07:38:38 +01:00
Ulf Gebhardt	31c5627598	quotes not needed	2022-02-07 07:28:33 +01:00
Ulf Gebhardt	9676672a34	.env-template needs quotes? ... adjusted start.sh and install.sh	2022-02-07 07:17:20 +01:00
Ulf Gebhardt	817e462698	fixed backend according to migration	2022-02-07 05:01:49 +01:00
Hannes Heine	80956bcee9	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-05 17:23:02 +01:00
Ulf Gebhardt	c21f7da5ce	lint fixes	2022-02-04 15:50:24 +01:00
elweyn	14d9366ad6	Merge branch 'remove_unnecessary_repositories' of https://github.com/gradido/gradido into remove_unnecessary_repositories	2022-02-04 15:49:21 +01:00
Ulf Gebhardt	545aca8ffb	lint fix	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	c63a42009e	removed references and implemented implicit active record queries	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	c101873375	removed unnecessary repositories, we can now use the implicit active record functions	2022-02-04 15:44:28 +01:00
Ulf Gebhardt	b54ae48162	fixed query	2022-02-03 21:45:45 +01:00
Ulf Gebhardt	ff77ffc82c	adjusted db version	2022-02-03 21:41:14 +01:00
Ulf Gebhardt	17e2e28aec	fixed backend implementation	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	6500901e2f	lint fix	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	da349230c8	removed LoginBackupUsers entity & references from backend resolvers	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	a334c916fd	fixed business logic with only one user	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	7baf05cf14	corrected field pubKey rename	2022-02-03 21:35:15 +01:00