IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,688 Commits 1 Branch 0 Tags
Commit Graph

2202 Commits

Author SHA1 Message Date
clauspeterhuebner
92bda917ca
Merge branch 'master' into 2220-feature-reconfigure-log4js 2022-09-30 00:27:25 +02:00
Claus-Peter Hübner
ff93c41c19 Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js 2022-09-28 21:41:51 +02:00
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +02:00
clauspeterhuebner
55a8174822
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-23 19:29:34 +02:00
Claus-Peter Hübner
516fc5c5e7 Merge remote-tracking branch 'origin/master' into 
2220-feature-reconfigure-log4js
 2022-09-23 19:28:28 +02:00
clauspeterhuebner
e955b92235
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 18:48:11 +02:00
Claus-Peter Hübner
ab1a4ac8d1 solve tests 2022-09-23 18:24:13 +02:00
Claus-Peter Hübner
b3bf7fecc4 Merge remote-tracking branch 'origin/master' into 
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
 2022-09-23 01:32:44 +02:00
Claus-Peter Hübner
969d6d0fbe 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-23 01:12:24 +02:00
Claus-Peter Hübner
e701f99553 rework PR comments 2022-09-23 01:11:37 +02:00
clauspeterhuebner
b0781bce88
Update backend/src/graphql/resolver/UserResolver.test.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-23 01:03:07 +02:00
clauspeterhuebner
62446bd2f0
Update backend/src/graphql/resolver/AdminResolver.test.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-23 00:56:36 +02:00
Claus-Peter Hübner
3dd66b4527 small changes in log-pattern 
Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
 2022-09-23 00:31:33 +02:00
Claus-Peter Hübner
99f0905bee Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js 2022-09-22 23:42:23 +02:00
clauspeterhuebner
810d258965
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-22 23:31:08 +02:00
Claus-Peter Hübner
de234cc7df rework PR remarks 2022-09-22 23:29:51 +02:00
Moriz Wahl
18008e9598
Merge branch 'master' into add-client-request-time 2022-09-22 21:13:27 +02:00
Hannes Heine
69b0ee7cbb
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-22 14:35:49 +02:00
Moriz Wahl
25dd12b18b
Merge branch 'master' into add-client-request-time 2022-09-22 14:18:14 +02:00
joseji
db21cf2e8d removed unused imports 2022-09-22 11:49:56 +02:00
joseji
f710fd9b45 fixed await for events redeem register 2022-09-22 11:19:32 +02:00
joseji
a8fc8b9249 solved conflicts 2022-09-22 11:01:10 +02:00
Alexander Friedland
672312a0dc
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-22 10:11:08 +02:00
joseji
c822580c1a removed unused variable 2022-09-21 19:53:57 +02:00
joseji
6202ca64ad test for register through transaction link done 2022-09-21 19:50:27 +02:00
elweyn
00d0068efc Remove unused imports. 2022-09-21 13:44:42 +02:00
elweyn
5aa499a073 Change the result for the FE so that we get datas from the contribution table instead of the transaction table. 2022-09-21 13:31:19 +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
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
Claus-Peter Hübner
6c88713f34 start inserting logger.addContext for userid 2022-09-20 16:20:52 +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
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
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