Wolfgang Huß
e1392b0483
Refine 'sendEmailTranslated.ts'
2022-11-11 13:40:10 +01:00
Wolfgang Huß
5fcd684b6b
Fix language conflict between current user and email receiving user
2022-11-11 12:10:26 +01:00
Wolfgang Huß
5b5aa2268b
Set current user language globaly
2022-11-11 12:09:41 +01:00
Wolfgang Huß
f8eea10371
Fix 'i18n' server integration for testing
...
- Fix the sending of the multiple times registrars name to the email owner.
- Clarify the logging of the multiple times registrars name and the email owners name.
2022-11-10 16:33:50 +01:00
Wolfgang Huß
9154ff32d1
Fix spelling in sendEmail.test.ts
2022-11-10 16:30:18 +01:00
Wolfgang Huß
a73cca0ab4
Implement 'i18n' better into the server
2022-11-10 15:23:51 +01:00
Wolfgang Huß
89d3105afb
Refine logger.info message for successfully send email
2022-10-12 11:53:02 +02:00
Wolfgang Huß
056afdb2a5
Fix hanging of seeding, because of the 'i18n' configuration
2022-10-11 10:05:27 +02:00
Wolfgang Huß
54461e2465
Fix test in 'UserResolver.test.ts'
2022-10-11 09:20:27 +02:00
Wolfgang Huß
05074e37bc
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
2022-10-10 17:51:55 +02:00
Wolfgang Huß
f90f981566
Refine translation
2022-10-10 17:51:40 +02:00
Wolfgang Huß
ad719dde43
Implement translation, very first approach
2022-10-10 11:54:09 +02:00
Wolfgang Huß
83d2aaa276
Refine email design
2022-10-05 13:39:38 +02:00
Wolfgang Huß
a02d8d0edb
Get email-template to work the first time
2022-10-05 11:07:16 +02:00
Wolfgang Huß
47e4be4697
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
2022-10-04 11:46:52 +02:00
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