2248 Commits

Author SHA1 Message Date
Claus-Peter Hübner
87af3f6b88 shift enum in index.ts 2022-11-29 00:17:23 +01:00
Claus-Peter Hübner
c3971222f0 first draft on sending List of apiVersion per socket 2022-11-25 17:55:01 +01:00
Claus-Peter Hübner
3fba096682 define ApiVersion enum 2022-11-25 17:54:22 +01:00
Claus-Peter Hübner
e7f523f20f add new config property 2022-11-25 17:53:58 +01:00
Claus-Peter Hübner
89283fa3da rework PR comments 2022-11-25 04:08:01 +01:00
Claus-Peter Hübner
9395b5a0ba resolve conflicts 2022-11-25 03:11:14 +01:00
Claus-Peter Hübner
efa46f50f3 resolve conflicts 2022-11-25 03:09:54 +01:00
Claus-Peter Hübner
7543acfb53 Merge branch '2367-feature-add-federation-configs' of
github.com:gradido/gradido into 2367-feature-add-federation-configs
2022-11-25 03:06:52 +01:00
Claus-Peter Hübner
7a2de6c437 rework PR comments 2022-11-25 03:03:57 +01:00
Claus-Peter Hübner
111602c707 rework PR comments 2022-11-25 03:03:17 +01:00
Claus-Peter Hübner
d021cb2918 renamend porperties to FEDERATION_xxx 2022-11-25 03:01:23 +01:00
clauspeterhuebner
192ab67817
Update backend/src/index.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-25 01:43:59 +01:00
Claus-Peter Hübner
5863736658 create DHT-KeyPair with optional configured Seed 2022-11-25 01:01:14 +01:00
Claus-Peter Hübner
28fa11bcd5 use the new config property to start DHT 2022-11-25 00:59:35 +01:00
Claus-Peter Hübner
cf1c68f290 define the federation config properties 2022-11-25 00:58:28 +01:00
Claus-Peter Hübner
7d56905b62 Merge remote-tracking branch 'origin/master' into 2367-feature-add-federation-configs 2022-11-24 23:35:20 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
joseji
60e3f62832 enum use on community user initialization 2022-11-23 11:32:27 +01:00
joseji
e55f516c51 removed unused import 2022-11-22 11:19:42 +01:00
joseji
3aeb9dd0f1 fixes added 2022-11-22 11:12:18 +01:00
jjimenezgarcia
b5c6f185ac
Merge branch 'master' into new-password-encryption 2022-11-20 18:15:16 +01:00
joseji
fc23fc9e87 fixes done 2022-11-20 18:14:43 +01:00
joseji
39d006351d unused import added wrongly 2022-11-17 14:10:46 +01:00
Wolfgang Huß
cd8c0b88ae Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-11-17 13:54:50 +01:00
Wolfgang Huß
c5469df997 Give 'html' tag the language of the email receiver 2022-11-17 13:50:01 +01:00
Wolfgang Huß
038d7a6a5f Refine and cleanup documentation 2022-11-17 13:49:18 +01:00
jjimenezgarcia
bc6fb2f71a
Merge branch 'master' into new-password-encryption 2022-11-17 13:38:49 +01:00
joseji
47d8469eb3 new password implementation set up and test 2022-11-17 13:38:16 +01:00
Moriz Wahl
36185a286a move clear all mocks to correct position 2022-11-16 14:42:45 +01:00
Moriz Wahl
eac290919d avoid reverse, restore removed clear mocks 2022-11-16 14:38:38 +01:00
Moriz Wahl
103790cccf use jest.fn() for void function, correct timezone offset 2022-11-16 14:24:17 +01:00
jjimenezgarcia
13df737c09
Merge branch 'master' into new-password-encryption 2022-11-15 20:32:32 +01:00
joseji
107cc016ba set up completed and working 2022-11-15 20:30:09 +01:00
clauspeterhuebner
9cdd3879e3
Merge branch 'master' into 2367-feature-add-federation-configs 2022-11-15 17:23:32 +01:00
Moriz Wahl
e4e308cdb4 fix seeds 2022-11-15 14:34:20 +01:00
Moriz Wahl
ef79580387 required argument client time zone offset for utils in creation 2022-11-15 14:20:33 +01:00
Moriz Wahl
d36fee0302 change order off arguements, implement changes for admin and contribution resolver 2022-11-15 14:10:18 +01:00
Moriz Wahl
fbc1b2bc32 fix get client time zone offset 2022-11-15 14:08:53 +01:00
Moriz Wahl
e89e30e33e change client request time to client timezone offset 2022-11-15 13:14:25 +01:00
Moriz Wahl
6ae1ba79f7 Merge branch 'master' into fix-timezone-problems 2022-11-15 12:57:02 +01:00
Wolfgang Huß
e9c4de5373 Remove old untranslated 'sendAccountMultiRegistrationEmail' 2022-11-14 13:59:51 +01:00
Wolfgang Huß
88b7e5ee78 Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
# Conflicts:
#	backend/package.json
#	backend/yarn.lock
2022-11-14 13:55:46 +01:00
Wolfgang Huß
8589f352ad Set backend 'i18n' language on login 2022-11-14 13:51:26 +01:00
Wolfgang Huß
7eefdd2843 Fix test of 'sendEmailTranslated' 2022-11-14 12:54:48 +01:00
Wolfgang Huß
17e0cbb15c Test email template 'sendAccountMultiRegistrationEmail' in english 2022-11-14 12:47:40 +01:00
Wolfgang Huß
c187b33a4d Test 'sendEmailTranslated' 2022-11-14 09:36:43 +01:00
Wolfgang Huß
2df19ab362 Document testing options 2022-11-14 09:17:52 +01:00
b8c1a9d477
fixed tests 2022-11-13 14:21:33 +01:00
f65cb9c586
missing change, deinem not with capital letter 2022-11-13 14:21:27 +01:00
dcfab11f5e
corrected E-Mail texts 2022-11-12 20:41:21 +01:00