369 Commits

Author	SHA1	Message	Date
elweyn	557ccf5da3	Merge master into this branch, comment out the protobuf encryption module to see if the structure would work without it.	2021-10-22 14:55:06 +02:00
Moriz Wahl	8344ee06c8	Merge branch 'master' into setup-tests-for-resolvers	2021-10-20 20:24:48 +02:00
Moriz Wahl	ae5b37d94d	Merge pull request #1021 from gradido/fix-decay-ceil ... fix: Decay Rounded to Ceil	2021-10-20 20:21:09 +02:00
Moriz Wahl	1def630e3b	hack to close the dn connection after tests	2021-10-19 18:48:21 +02:00
Moriz Wahl	7e48e4f850	full test for communities, another try for docker compose	2021-10-19 00:08:52 +02:00
Moriz Wahl	cffadab4af	fix: Decay Rounded to Ceil	2021-10-18 21:50:42 +02:00
Moriz Wahl	10b65487ee	createServer for application and tests	2021-10-18 20:17:17 +02:00
Moriz Wahl	77eb01b01b	Merge branch 'master' into setup-tests-for-resolvers	2021-10-18 19:20:50 +02:00
Ulf Gebhardt	dd21918b0b	corrected all entity imports	2021-10-18 15:38:42 +02:00
einhornimmond	0e7236e9ef	change symbol name and <	2021-10-15 12:29:56 +02:00
einhornimmond	2f3ad854d5	fix fix fix	2021-10-15 12:25:05 +02:00
einhornimmond	dece5f357b	fix	2021-10-15 12:15:18 +02:00
einhornimmond	4cd7efe184	fix to checko for 2 after comma instead of 4	2021-10-15 12:05:06 +02:00
Hannes Heine	cc9e3b54c9	Revert "deliver a decay block every time"	2021-10-15 12:02:14 +02:00
einhornimmond	72b45ce5b3	move in correct branch	2021-10-15 11:49:58 +02:00
einhornimmond	33796181d6	update first name, last name and username in community server db on change	2021-10-15 11:40:25 +02:00
einhornimmond	870d029cd3	deliver a decay block every time	2021-10-15 11:26:48 +02:00
Moriz Wahl	e58c5726cb	Merge pull request #968 from gradido/community-production ... refactor: In Production only Show one Community	2021-10-14 14:56:48 +02:00
Moriz Wahl	96564394d8	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-10-13 20:02:25 +02:00
Moriz Wahl	0e75826b28	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-10-13 20:02:13 +02:00
elweyn	58182d73c6	Added the publisherId to the login & createUser calls, adjusted the tests to the new code.	2021-10-13 13:26:46 +02:00
elweyn	5a14161284	Adding the publisherId to the login call and that it stores it to the user profile.	2021-10-13 12:07:23 +02:00
Moriz Wahl	f2ec81e2b2	feat: In Production only Show one Community	2021-10-12 21:28:29 +02:00
elweyn	3fdb503ea6	Merge branch 'master' into 804-elopage-registration	2021-10-12 17:08:06 +02:00
einhornimmond	29de8e224f	Merge pull request #960 from gradido/add_autocorrect_keys ... Add autocorrect keys	2021-10-12 17:00:36 +02:00
elweyn	d3198b037e	Fixe model for User and adding hasElopage to User Object.	2021-10-12 16:50:07 +02:00
einhornimmond	4464611759	Merge pull request #949 from gradido/login_checkForElopage ... check for elopage account	2021-10-12 16:25:03 +02:00
einhornimmond	3ecf960ab6	fix lint	2021-10-12 15:56:02 +02:00
einhornimmond	0640eb24d5	remove copy user disabled field	2021-10-12 15:42:48 +02:00
einhornimmond	1486476571	add auto correct keys to apollo, copy also disabled field of user	2021-10-12 15:24:14 +02:00
einhorn_b	b6bfd55c98	fix lint	2021-10-12 15:21:45 +02:00
einhorn_b	715d51272c	check if recipiant account is not disabled	2021-10-12 14:42:31 +02:00
Einhornimmond	cceca9d517	change query name	2021-10-11 13:12:26 +02:00
Einhornimmond	3a5aa25fec	update variable names	2021-10-11 13:11:50 +02:00
Einhornimmond	660e1e4b68	add call for checkpid on gdt server	2021-10-10 17:27:42 +02:00
Einhornimmond	f6cba24c00	merge with master	2021-10-10 15:44:11 +02:00
einhornimmond	909c7e3a9a	fix lint	2021-10-10 15:31:28 +02:00
einhornimmond	546d371139	check always for hasElopage ... - put check into async task to let it run at the same time as the password check	2021-10-10 15:25:01 +02:00
Einhornimmond	865403e0fa	fix double transaction entry	2021-10-10 13:24:50 +02:00
Einhornimmond	bfa0e9481c	fix problems with transaction	2021-10-08 18:20:52 +02:00
Einhornimmond	a839b964eb	fix problems with catch and UnhandledPromiseRejectionWarning	2021-10-08 16:43:30 +02:00
einhornimmond	143b7f6d5c	fix transactions, now rollback work like expected	2021-10-08 12:52:14 +02:00
einhornimmond	93532004d5	add option in login call to check also for elopage account	2021-10-08 10:26:09 +02:00
einhornimmond	b4ed516a8e	use protobuf models as static modules, first approach didn't work	2021-10-07 20:00:46 +02:00
Moriz Wahl	c6a373d24d	pass CI tests	2021-10-07 19:46:42 +02:00
einhornimmond	e6c8fbed59	fix linting	2021-10-07 16:32:17 +02:00
einhornimmond	cc8a4fcd5b	add api call to check is user has an elopage account to login-server and to apollo-server	2021-10-07 16:08:14 +02:00
Moriz Wahl	d8265b0c27	got the test working	2021-10-07 15:36:40 +02:00
einhornimmond	ad167fc051	Merge pull request #915 from gradido/apollo_saveUserOnCreate ... Add User on createUser to community server db	2021-10-07 14:37:20 +02:00
einhornimmond	a622fe02cd	linting	2021-10-07 13:24:47 +02:00