1720 Commits

Author SHA1 Message Date
Moriz Wahl
77d93f18fa remove test 2022-11-24 13:13:01 +01:00
Moriz Wahl
b3e880d45f undo refactoring 2022-11-24 13:03:50 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
elweyn
b05c009d6e Merge branch 'master' into 2285-mark-creation-via-link 2022-11-24 09:05:36 +01:00
6f8212fe54
test fix 2022-11-23 23:52:53 +01:00
7b2e6730bd
lint fixes 2022-11-23 23:44:43 +01:00
ecb99bd603
separate Contribution- and TransactionLink Resolvers 2022-11-23 23:37:47 +01:00
a2c1b0ff96
separate AdminResolver.test into the corresponding parts 2022-11-23 22:52:22 +01:00
Moriz Wahl
ea62a7f710 fix(backend): email verification code never expired 2022-11-22 18:01:36 +01:00
Wolfgang Huß
98798d3322 Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts' 2022-11-22 17:24:36 +01:00
Wolfgang Huß
76fa425529 Refactor 'sendAddedContributionMessageEmail' email to HTML and translatable 2022-11-22 13:18:32 +01:00
4554b01b89
order and correct imports of resolvers 2022-11-22 13:01:38 +01:00
db1a11a2b5
seperate admin resolver into existing resolvers 2022-11-22 12:41:08 +01:00
joseji
e55f516c51 removed unused import 2022-11-22 11:19:42 +01:00
joseji
3aeb9dd0f1 fixes added 2022-11-22 11:12:18 +01:00
Wolfgang Huß
624cd6e4bc Fix spelling of error message in 'sendActivationEmail' 2022-11-22 08:34:48 +01:00
Wolfgang Huß
18a4408e8a Adjust the tests for new translatable 'sendAccountActivationEmail' 2022-11-21 13:37:29 +01:00
jjimenezgarcia
b5c6f185ac
Merge branch 'master' into new-password-encryption 2022-11-20 18:15:16 +01:00
joseji
fc23fc9e87 fixes done 2022-11-20 18:14:43 +01:00
Wolfgang Huß
ba1ec66707 Merge branch '1288-email-templates' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-17 14:10:49 +01:00
joseji
39d006351d unused import added wrongly 2022-11-17 14:10:46 +01:00
Hannes Heine
878a538255
Merge branch 'master' into 2285-mark-creation-via-link 2022-11-17 14:05:16 +01:00
Wolfgang Huß
cd8c0b88ae Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-11-17 13:54:50 +01:00
Wolfgang Huß
369752783c Translate and HTML'lize email 'sendAccountActivation' 2022-11-17 13:46:59 +01:00
jjimenezgarcia
bc6fb2f71a
Merge branch 'master' into new-password-encryption 2022-11-17 13:38:49 +01:00
joseji
47d8469eb3 new password implementation set up and test 2022-11-17 13:38:16 +01:00
Moriz Wahl
36185a286a move clear all mocks to correct position 2022-11-16 14:42:45 +01:00
Moriz Wahl
eac290919d avoid reverse, restore removed clear mocks 2022-11-16 14:38:38 +01:00
Moriz Wahl
103790cccf use jest.fn() for void function, correct timezone offset 2022-11-16 14:24:17 +01:00
jjimenezgarcia
13df737c09
Merge branch 'master' into new-password-encryption 2022-11-15 20:32:32 +01:00
joseji
107cc016ba set up completed and working 2022-11-15 20:30:09 +01:00
Moriz Wahl
e4e308cdb4 fix seeds 2022-11-15 14:34:20 +01:00
Moriz Wahl
ef79580387 required argument client time zone offset for utils in creation 2022-11-15 14:20:33 +01:00
Moriz Wahl
d36fee0302 change order off arguements, implement changes for admin and contribution resolver 2022-11-15 14:10:18 +01:00
Wolfgang Huß
88b7e5ee78 Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
# Conflicts:
#	backend/package.json
#	backend/yarn.lock
2022-11-14 13:55:46 +01:00
Wolfgang Huß
8589f352ad Set backend 'i18n' language on login 2022-11-14 13:51:26 +01:00
Wolfgang Huß
c187b33a4d Test 'sendEmailTranslated' 2022-11-14 09:36:43 +01:00
Wolfgang Huß
5b5aa2268b Set current user language globaly 2022-11-11 12:09:41 +01:00
Moriz Wahl
e3d3f4bb94 liniting and improved names 2022-11-11 11:30:25 +01:00
Moriz Wahl
37e9482807 have timezoneOffset as optional parameter 2022-11-10 19:59:33 +01:00
Moriz Wahl
2b27e6aaa8 test for valid date string for creation date 2022-11-10 19:18:01 +01:00
Moriz Wahl
5e2d6c3bc9 fix: Timezone Problems on Change of Month 2022-11-10 19:01:16 +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
elweyn
8caf482943 Store transactionLinkId to the transaction 2022-11-10 10:52:36 +01:00
joseji
ac6b8e666f encryption interface 2022-11-09 10:46:01 +01:00
Hannes Heine
e57e8120b7
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-09 09:28:24 +01:00
Hannes Heine
7d26669f99
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-09 09:28:07 +01:00
jjimenezgarcia
5606c80057
Merge branch 'master' into logger-error-cleaning-history 2022-11-08 13:25:16 +01:00
Hannes Heine
1a799f3020
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-08 12:05:54 +01:00
elweyn
c79d186a45 Log error when contribution is in the wrong state. Write full content in changeMessage. 2022-11-07 10:32:26 +01:00