2390 Commits

Author SHA1 Message Date
Wolfgang Huß
369752783c Translate and HTML'lize email 'sendAccountActivation' 2022-11-17 13:46:59 +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
Wolfgang Huß
e1392b0483 Refine 'sendEmailTranslated.ts' 2022-11-11 13:40:10 +01:00
Wolfgang Huß
5fcd684b6b Fix language conflict between current user and email receiving user 2022-11-11 12:10:26 +01:00
Wolfgang Huß
5b5aa2268b Set current user language globaly 2022-11-11 12:09:41 +01:00
Wolfgang Huß
f8eea10371 Fix 'i18n' server integration for testing
- Fix the sending of the multiple times registrars name to the email owner.
- Clarify the logging of the multiple times registrars name and the email owners name.
2022-11-10 16:33:50 +01:00
Wolfgang Huß
9154ff32d1 Fix spelling in sendEmail.test.ts 2022-11-10 16:30:18 +01:00
Wolfgang Huß
a73cca0ab4 Implement 'i18n' better into the server 2022-11-10 15:23:51 +01:00
Hannes Heine
e57e8120b7
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-09 09:28:24 +01:00
Hannes Heine
7d26669f99
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-09 09:28:07 +01:00
jjimenezgarcia
5606c80057
Merge branch 'master' into logger-error-cleaning-history 2022-11-08 13:25:16 +01:00
Hannes Heine
1a799f3020
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-08 12:05:54 +01:00
Moriz Wahl
6d1224d7c5
Merge branch 'master' into setup-hyperswarm 2022-11-07 13:17:26 +01:00
Moriz Wahl
7efd2ffca3 linting, etc. 2022-11-07 13:16:22 +01:00
Moriz Wahl
8aac319895 move DHT connection into main 2022-11-07 12:45:44 +01:00
Moriz Wahl
51cc3164b2 use logger instead of console 2022-11-07 12:27:43 +01:00
elweyn
c79d186a45 Log error when contribution is in the wrong state. Write full content in changeMessage. 2022-11-07 10:32:26 +01:00
elweyn
c2fc4feb6a Call method to send Email if contribution is rejected. 2022-11-07 10:11:14 +01:00
elweyn
225119c8ab Test that the email is build correctly. 2022-11-07 10:10:28 +01:00
elweyn
0192a45346 Build and send email for rejected contributions. 2022-11-07 10:09:49 +01:00
elweyn
d092bd0068 German email template for rejected contributions. 2022-11-07 10:08:23 +01:00
elweyn
b3fd53ab7a Change the display of the history message. 2022-11-03 08:35:26 +01:00
jjimenezgarcia
d693f5f025
Merge branch 'master' into logger-error-cleaning-history 2022-11-02 15:22:30 +01:00
Hannes Heine
677519dda7
Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-11-02 13:27:06 +01:00
Moriz Wahl
7f56eb2f75 release: Version 1.13.3 2022-11-01 15:48:31 +01:00
Moriz Wahl
fdd3b0f4fd fix: Release Statistic Query Runner 2022-11-01 14:30:43 +01:00
joseji
16699e19ad small details 2022-10-31 14:46:52 +01:00
jjimenezgarcia
1560e80d0c
Merge branch 'master' into logger-error-cleaning-history 2022-10-28 11:53:36 +02:00
joseji
f69abcd04c small tests modified 2022-10-28 11:46:18 +02:00
Moriz Wahl
f88db9470e release: Version 1.13.2 2022-10-28 11:27:56 +02:00
joseji
9846e095bf logger now mocked propperly 2022-10-28 11:22:58 +02:00
Hannes Heine
a0bf498f40
Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-10-28 09:57:33 +02:00
Moriz Wahl
c3b624f36f add order by clause 2022-10-27 19:55:23 +02:00
Moriz Wahl
568a6cdd2c
Merge branch 'master' into 2202-refactor-creations-query 2022-10-27 15:01:40 +02:00
Moriz Wahl
c55be14d5a add more code from poc 2022-10-27 07:26:52 +02:00
Moriz Wahl
d0d84af7ee fix merging errors 2022-10-27 06:50:25 +02:00
Moriz Wahl
0ac2a4d2c8 Merge branch 'master' into setup-hyperswarm 2022-10-27 06:42:57 +02:00
elweyn
69004d5659 Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-10-26 12:05:49 +02:00
elweyn
0d304f9d71 Remove TODO comments and change the written message to only the old values no prefix. 2022-10-26 12:05:27 +02:00
joseji
1407ea0e8b skipped test for changing month 2022-10-26 11:26:04 +02:00
Moriz Wahl
b2a1d7d672 include pending contributions for validation of contribution link, test it 2022-10-26 06:38:49 +02:00