11341 Commits

Author SHA1 Message Date
elweyn
a93085b822 Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-21 12:42:38 +02:00
elweyn
6c0cb17196 Refactor sendTransactionLinkredeemed
.
2022-09-21 12:41:25 +02:00
elweyn
686c43fa89 Change text of linkRedeemed template. 2022-09-21 12:12:23 +02:00
elweyn
3b3a963ac5 Change text template of contributionConfirmed. 2022-09-21 12:09:36 +02:00
elweyn
6c446fb477 Change text template of transactionReceived. 2022-09-21 12:07:19 +02:00
elweyn
bf6ed35c6e Change text template of ContributionMessageReceived. 2022-09-21 12:05:49 +02:00
elweyn
3a36e09e8f Merge branch '2202-refactor-creations-query' of https://github.com/gradido/gradido into 2202-refactor-creations-query 2022-09-21 11:47:31 +02:00
elweyn
e097c30003 Add denied_at is null to query, change variable name of query. 2022-09-21 11:47:24 +02:00
Claus-Peter Hübner
542b069aa9 reconfig now with rollover feature and userid in logevent-message 2022-09-21 04:12:48 +02:00
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
736d8023bb add description to create cronjobs for deleting yarn /tmp output 2022-09-20 19:10:54 +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
34071fd9b4 use the new env variable GRADIDO_ENV_NAME to init NODE_ENV 2022-09-20 18:21:24 +02:00
Claus-Peter Hübner
ae01f99c36 describe the manual setting of new env variable GRADIDO_ENV_NAME 2022-09-20 18:20:42 +02:00
clauspeterhuebner
cf835a690c
Merge branch 'master' into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-09-20 16:30:33 +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
Claus-Peter Hübner
70963203a0 rework Event definitions 2022-09-20 00:39:45 +02:00
jjimenezgarcia
dfda1b6d36
Merge pull request #2204 from gradido/events-and-logs-user-resolver
Refactor: Events and logs completed in User Resolver
2022-09-19 21:49:34 +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
Moriz Wahl
a9cc4e9339 remove value column 2022-09-19 18:10:11 +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
d2ff1862e6 Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-16 15:22:56 +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
ogerly
fbc9c6aa29 delete unused file graphql/showContributionLink.js 2022-09-16 12:41:30 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
ogerly
bc474e79ff delete contribution link and update contribution list 2022-09-16 12:03:11 +02:00
ogerly
db2415e617 fix locales 2022-09-16 10:22:19 +02:00
ogerly
420296ca94 fix lint 2022-09-16 09:59:44 +02:00
ogerly
641d2d4cc2 creation date better represented 2022-09-16 09:58:41 +02:00
Alexander Friedland
387ea5949f
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link 2022-09-16 09:15:28 +02:00
Alexander Friedland
8ea1a207c7
Merge pull request #2210 from gradido/change-support-mail
change support mail
2022-09-16 09:15:10 +02:00
ogerly
f19b521726 add support mail in env 2022-09-16 09:01:29 +02:00
ogerly
222d8c2f57 fix lint 2022-09-16 08:25:55 +02:00