2583 Commits

Author SHA1 Message Date
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
clauspeterhuebner
ce1b488865
Update backend/.env.template
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-25 01:37:56 +01:00
clauspeterhuebner
68586eaae7
Update backend/.env.dist
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-25 01:37:36 +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
b4fbb09f26 define the federation config properties 2022-11-25 00:57:48 +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
Wolfgang Huß
b68f550b6c Remove old untranslated email 'sendResetPasswordEmail' 2022-11-24 22:16:18 +01:00
Wolfgang Huß
2d634b4111 Test 'sendResetPasswordEmail' 2022-11-24 22:10:07 +01:00
Wolfgang Huß
a652654be7 Refactor 'sendResetPasswordEmail' email to HTML and translatable 2022-11-24 22:09:36 +01:00
Wolfgang Huß
44f2e6b06a Move 'getTimeDurationObject' and 'printTimeDuration' into a separate file 2022-11-24 20:15:55 +01:00
Moriz Wahl
f2e8846932 rename migration file, set new db version in backend 2022-11-24 16:37:32 +01:00
Wolfgang Huß
e07a2f88c1 Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-24 16:23:10 +01:00
Wolfgang Huß
3b030e4612 Remove old untranslated email 'sendContributionRejectedEmail' 2022-11-24 16:12:48 +01:00
Wolfgang Huß
ae65af9df8 Test 'sendContributionRejectedEmail' 2022-11-24 16:10:41 +01:00
Wolfgang Huß
72213988ac Refactor 'sendContributionRejectedEmail' email to HTML and translatable 2022-11-24 16:10:29 +01:00
Wolfgang Huß
dd33254acb Remove old untranslated email 'sendContributionConfirmedEmail' 2022-11-24 14:56:09 +01:00
Wolfgang Huß
727e5ca1f6 Test 'sendContributionConfirmedEmail' 2022-11-24 14:45:33 +01:00
Wolfgang Huß
c87ffd5b8a Refactor 'sendContributionConfirmedEmail' email to HTML and translatable 2022-11-24 14:44:50 +01:00
bd28a888a6
Merge branch 'master' into jest_is_dev_depenency 2022-11-24 13:40:59 +01:00
Moriz Wahl
77d93f18fa remove test 2022-11-24 13:13:01 +01:00
Moriz Wahl
b3e880d45f undo refactoring 2022-11-24 13:03:50 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
elweyn
b05c009d6e Merge branch 'master' into 2285-mark-creation-via-link 2022-11-24 09:05:36 +01:00
6f8212fe54
test fix 2022-11-23 23:52:53 +01:00
7b2e6730bd
lint fixes 2022-11-23 23:44:43 +01:00
ecb99bd603
separate Contribution- and TransactionLink Resolvers 2022-11-23 23:37:47 +01:00
a2c1b0ff96
separate AdminResolver.test into the corresponding parts 2022-11-23 22:52:22 +01:00
joseji
60e3f62832 enum use on community user initialization 2022-11-23 11:32:27 +01:00
Moriz Wahl
ea62a7f710 fix(backend): email verification code never expired 2022-11-22 18:01:36 +01:00
Wolfgang Huß
98798d3322 Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts' 2022-11-22 17:24:36 +01:00
Wolfgang Huß
a1ec8dfa4f Remove old untranslated email 'sendAddedContributionMessageEmail' 2022-11-22 14:16:10 +01:00
Wolfgang Huß
fb01567169 Test 'sendAddedContributionMessageEmail' in 'sendEmailVariants.test.ts' 2022-11-22 14:13:01 +01:00
Wolfgang Huß
76fa425529 Refactor 'sendAddedContributionMessageEmail' email to HTML and translatable 2022-11-22 13:18:32 +01:00
4554b01b89
order and correct imports of resolvers 2022-11-22 13:01:38 +01:00
db1a11a2b5
seperate admin resolver into existing resolvers 2022-11-22 12:41:08 +01:00
Wolfgang Huß
53b29db25e Add README's for locales – especially for quotation marks 2022-11-22 11:24:13 +01:00
joseji
e55f516c51 removed unused import 2022-11-22 11:19:42 +01:00
Wolfgang Huß
0695ac282b Adjust the fixed 'CONFIG.EMAIL_TEST_MODUS' problem in 'sendEmailTranslated.ts' 2022-11-22 11:17:26 +01:00
joseji
3aeb9dd0f1 fixes added 2022-11-22 11:12:18 +01:00
Wolfgang Huß
624cd6e4bc Fix spelling of error message in 'sendActivationEmail' 2022-11-22 08:34:48 +01:00
41891c1b57
Merge branch 'master' into jest_is_dev_depenency 2022-11-21 17:19:12 +01:00