IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,457 Commits 1 Branch 0 Tags
Commit Graph

10457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
clauspeterhuebner
4735687c0b
Merge pull request #2234 from gradido/2219-feature-rework-eventprotocol 
2219 feature rework eventprotocol
 2022-09-22 22:06:47 +02:00
clauspeterhuebner
63afbab8ea
Merge branch 'master' into 2219-feature-rework-eventprotocol 2022-09-22 14:56:26 +02:00
jjimenezgarcia
47a7778481
Merge pull request #2214 from gradido/test-register-with-redeem-code 
Refactor: Test register with redeem code
 2022-09-22 14:20:51 +02:00
jjimenezgarcia
1d9f76b483
Merge branch 'master' into test-register-with-redeem-code 2022-09-22 14:04: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
Alexander Friedland
c4b4661a5c
Merge pull request #2211 from gradido/2203-Delete-query-when-redeeming-the-Redeem-link 
2203 delete query modal when redeeming the redeem link
 2022-09-22 11:13:49 +02:00
joseji
a8fc8b9249 solved conflicts 2022-09-22 11:01:10 +02:00
Alexander Friedland
ef49dee81d
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link 2022-09-22 10:10:59 +02:00
Hannes Heine
0102aab498
Merge pull request #2228 from gradido/2226-change-email-templates 
Refactor: 🍰 Change email templates
 2022-09-22 09:52:27 +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
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
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
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
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
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
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
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
ogerly
caf487d206 remove text from modal for redeem link 2022-09-16 08:24:31 +02:00
ogerly
e3e5fdd12b remove modal box if redeem a redeemlink 2022-09-16 08:22:24 +02:00
ogerly
dbc3297305 change support mail 2022-09-15 21:02:16 +02:00