2551 Commits

Author SHA1 Message Date
Wolfgang Huß
dc7957a0fb Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables
# Conflicts:
#	backend/src/util/utilities.ts
2022-11-28 11:22:25 +01:00
Wolfgang Huß
4ae96a2213 Translate 'Gradido (nicht antworten)' 2022-11-28 11:13:04 +01:00
Wolfgang Huß
3b47330c92 Remove remainders of old untranslated emails 2022-11-28 11:05:12 +01:00
Wolfgang Huß
93e3562318 Remove old untranslated email 'sendTransactionReceivedEmail' 2022-11-28 11:04:34 +01:00
Wolfgang Huß
9894b02f51 Test 'sendTransactionReceivedEmail' 2022-11-28 10:54:31 +01:00
Wolfgang Huß
3903e29e16 Refactor 'sendTransactionReceivedEmail' email to HTML and translatable 2022-11-28 10:54:10 +01:00
Wolfgang Huß
0cccdb56de Test that 'sendEmailTranslated' on 'CONFIG.EMAIL_TEST_MODUS = true' replaces the receiver with by the fake test mail accaount 2022-11-28 09:38:19 +01:00
71b1d409b9
Merge branch 'master' into jest_is_dev_depenency 2022-11-27 00:05:22 +01:00
Wolfgang Huß
2b65c6b261 Remove old untranslated email 'sendTransactionLinkRedeemedEmail' 2022-11-26 15:45:41 +01:00
Wolfgang Huß
699daa8eec Test 'sendTransactionLinkRedeemedEmail' 2022-11-26 15:43:44 +01:00
Wolfgang Huß
224613f6d4 Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable 2022-11-26 15:42:44 +01:00
Wolfgang Huß
4b097f6f66 Add line ends to all 'subject.pug' files 2022-11-26 12:59:06 +01:00
2caf0ee664
v1.15.0 2022-11-26 01:14:24 +01:00
48365c7bb3
Merge branch 'master' into 2367-feature-add-federation-configs 2022-11-25 17:53:48 +01:00
2c3cac5939
Merge branch 'master' into fix-balance-migration 2022-11-25 17:48:28 +01:00
Moriz Wahl
aa1a88bc11
Merge branch 'master' into fix-wrong-balance 2022-11-25 14:44:39 +01:00
Moriz Wahl
9253706513 remove comment 2022-11-25 14:32:23 +01:00
Moriz Wahl
62c48712a4 fix misspelled text 2022-11-25 14:32:12 +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
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