2500 Commits

Author SHA1 Message Date
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
Claus-Peter Hübner
6c88713f34 start inserting logger.addContext for userid 2022-09-20 16:20:52 +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
220da200a8
Merge branch 'master' into add-client-request-time 2022-09-20 10:57:24 +02:00
Hannes Heine
228017184a
Merge branch 'master' into 2202-refactor-creations-query 2022-09-20 10:45:57 +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
elweyn
4e72aafe4d Change the query so that we only look on the contributions table. 2022-09-18 11:22:25 +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
Claus-Peter Hübner
86b12f98ed set overall resolvers the isolationlevel to REPEATABLE READ 2022-09-16 15:20:51 +02:00
Claus-Peter Hübner
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +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
b8442e1725 added redeem register event test, transaction link execution failing 2022-09-16 13:42:45 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
clauspeterhuebner
d592c57024
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 17:56:21 +02:00
Claus-Peter Hübner
bb8fc6a16e change using findUserByEmail() instead of raw queries 2022-09-15 17:48:22 +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
Moriz Wahl
80bbf24116 add client request time to context 2022-09-15 12:30:29 +02:00
joseji
ded649f342 Events and logs completed in User Resolver 2022-09-15 11:42:03 +02:00
Claus-Peter Hübner
4e07aeaff1 Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 02:43:18 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
clauspeterhuebner
64aab998e2
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-14 23:57:53 +02:00
Claus-Peter Hübner
13d79fd8b7 remove multi-line comments 2022-09-14 23:00:47 +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
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
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
Claus-Peter Hübner
d9313b68db init moderator in UnconfirmedContribution 2022-09-12 19:26:59 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +02:00
Claus-Peter Hübner
68ba6def14 now find users including emailContact 2022-09-12 18:41:17 +02:00
Claus-Peter Hübner
e6155d52e1 solve error 2022-09-12 18:34:21 +02:00
Claus-Peter Hübner
94f15f7475 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-12 18:18:46 +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