2127 Commits

Author SHA1 Message Date
Claus-Peter Hübner
fa76bd68a1 Merge remote-tracking branch 'origin/master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-20 19:23:30 +02:00
Claus-Peter Hübner
d29d9bd2ba add property changes in .env files as mentioned in PR 2022-09-20 19:11:57 +02:00
Claus-Peter Hübner
95b4052ed5 correct and more detailed logoutput 2022-09-20 18:26:56 +02:00
Claus-Peter Hübner
7f818fa77e add new const server.ENV_NAME, which will be init by GRADIDO_ENV_NAME in
start.sh or by NODE_ENV in .env
2022-09-20 18:26:02 +02:00
clauspeterhuebner
fc706bc030
Update backend/src/server/createServer.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-20 16:08:56 +02:00
clauspeterhuebner
49e0606d16
Update backend/src/server/createServer.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-20 16:08:44 +02:00
clauspeterhuebner
ae3ef7edda
Update backend/src/mailer/sendEMail.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-20 16:08:28 +02:00
clauspeterhuebner
efb6ad70f6
Update backend/src/config/index.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-20 16:08:05 +02:00
Moriz Wahl
5378a17daf
Merge branch 'master' into events-and-logs-user-resolver 2022-09-19 19:31:51 +02:00
joseji
1203dada61 ids are now checked in event creation 2022-09-19 19:18:06 +02:00
Claus-Peter Hübner
3afc8c65c3 change in one testcase mail.to to CONFIG.EMAIL_TEST_RECEIVER 2022-09-19 17:47:46 +02:00
jjimenezgarcia
5f94cfca88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-19 15:40:59 +02:00
Claus-Peter Hübner
f9194beca3 change with test-mode = on the email-receiver to EMAIL_TEST_RECEIVER 2022-09-16 16:53:35 +02:00
Claus-Peter Hübner
4f97999195 add prevention to run production in test-mode 2022-09-16 16:52:54 +02:00
Claus-Peter Hübner
8c38116bde add TEST_MODUS-switch and EMAIL_TEST_RECEIVER 2022-09-16 16:52:19 +02:00
joseji
cfdec3d122 Fixed wrong handling of dates in tests failing depending on the day you execute them 2022-09-16 13:45:20 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
Hannes Heine
e3c6918436
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-15 16:33:16 +02:00
Hannes Heine
f261e76a38
Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-15 16:02:37 +02:00
Hannes Heine
c71caa139d
Merge branch 'master' into 2010-send-email-to-transaction-link-sender 2022-09-15 15:44:35 +02:00
joseji
ded649f342 Events and logs completed in User Resolver 2022-09-15 11:42:03 +02:00
elweyn
a2309ea1a5 Correct text, 'Deine' => 'Dein'. 2022-09-14 11:28:28 +02:00
elweyn
e3257c1f71 Fix prettier. 2022-09-14 11:22:42 +02:00
elweyn
6d15ea5c2b Remove unused import. 2022-09-14 11:20:50 +02:00
elweyn
3b810b2add Tests that sendContributionConfirmedEmail is called, removed contributionAmount since it can not be checked. 2022-09-14 09:31:39 +02:00
Hannes Heine
4d493f5a4f
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-14 09:07:01 +02:00
elweyn
ce1fe72a4f Merge branch '2134-send-email-when-admin-writes-message-to-contribution' of https://github.com/gradido/gradido into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-14 09:05:21 +02:00
Hannes Heine
6704cb0f87
Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-14 09:04:56 +02:00
elweyn
0820d8d529 Tests that the method sendAddedContributionMessageEmail is called. 2022-09-14 09:04:39 +02:00
elweyn
d65bd827ca Change search to get the contribution.user instead of queriing it after wards. 2022-09-14 09:03:28 +02:00
Hannes Heine
a87667af02
Update backend/src/mailer/sendAddedContributionMessageEmail.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-14 08:34:41 +02:00
Moriz Wahl
65318c4498 release: Version 1.12.1 2022-09-13 13:37:30 +02:00
elweyn
7ab7380f09 Call new method to send confirmedContribution EMail to the user. 2022-09-12 11:36:24 +02:00
elweyn
0356ae6f26 Add method to send email when contribution has been confirmed. 2022-09-12 11:35:56 +02:00
elweyn
7812a941b5 Add EMail text for contributionConfirmed. 2022-09-12 11:35:31 +02:00
elweyn
72f85c0d59 Add test for sendContributionConfirmedEmail. 2022-09-12 11:35:01 +02:00
Moriz Wahl
39d7de3d4b release: v1.12.0 2022-09-12 10:47:07 +02:00
elweyn
42f667674e Remove unused import. 2022-09-09 14:54:37 +02:00
elweyn
a3d65228f9 Add sendEmail mock to the test file. 2022-09-09 14:44:22 +02:00
elweyn
93e7684eda Change import to the new file. 2022-09-09 14:44:00 +02:00
elweyn
655e405866 Change text of email. 2022-09-09 14:43:30 +02:00
elweyn
2651a8afca Move test for sendAddedContributionMessageEmail. 2022-09-09 09:20:56 +02:00
elweyn
5aea6f9d9d Move sendAddedContributionMessageEmail to new file. 2022-09-09 09:20:34 +02:00
elweyn
d49d5f6bb7 Remove addedContributionMessageEmail test from this file. 2022-09-09 09:20:14 +02:00
elweyn
032348f8c2 Remove addedContributionMessageEmail from this file. 2022-09-09 09:19:49 +02:00
elweyn
663097c378 Fix data with named contributionMemo instead. 2022-09-09 07:52:04 +02:00
elweyn
690b18c307 Remove email of admin who sends message. 2022-09-09 07:49:11 +02:00
elweyn
d73143cfdf Call method to send Email when an admin add a new contributionmessage. 2022-09-09 07:42:27 +02:00
elweyn
d2ff899100 Add method for sending EMail when their is a new contributionMessage from admin. 2022-09-09 07:41:45 +02:00
elweyn
d08b609088 Define the german text for the email addedContributionMessage. 2022-09-09 07:40:48 +02:00