409 Commits

Author SHA1 Message Date
Moriz Wahl
02656ee117 fix tests after merge 2022-12-13 15:49:41 +01:00
Moriz Wahl
98742c0db1 Merge branch 'master' into test-validation-of-optin-codes 2022-12-13 14:57:15 +01:00
7638d29052
merge 2022-12-09 14:09:43 +01:00
903fe56f60
Merge branch 'master' into dissolve_admin_resolver
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.test.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.ts
2022-12-09 14:09:33 +01:00
joseji
9604a6309a found more and more junk everywhere, almost cleared 2022-12-06 22:31:15 +01:00
Moriz Wahl
796f5af2c6 remove unused function, count resent by admin 2022-11-30 14:45:02 +01:00
Moriz Wahl
bbd163f1e0 integrate export const checkEmailVerificationCode = async ( 2022-11-30 14:34:09 +01:00
Moriz Wahl
10781b2e6b Merge branch 'master' into test-validation-of-optin-codes 2022-11-30 14:15:21 +01:00
joseji
7fe7b98dfe removing non necessary functions 2022-11-29 13:10:33 +01:00
joseji
81f6066754 removed unused code 2022-11-29 13:06:17 +01:00
joseji
7e78f1c893 migration fixed 2022-11-29 13:03:10 +01:00
fa5b7e6b81
Merge branch 'master' into dissolve_admin_resolver
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.test.ts
#	backend/src/graphql/resolver/UserResolver.ts
2022-11-29 06:15:31 +01:00
joseji
e350307e6a removing keys and passphrases 2022-11-28 23:59:57 +01:00
Wolfgang Huß
a652654be7 Refactor 'sendResetPasswordEmail' email to HTML and translatable 2022-11-24 22:09:36 +01:00
Wolfgang Huß
44f2e6b06a Move 'getTimeDurationObject' and 'printTimeDuration' into a separate file 2022-11-24 20:15:55 +01:00
Wolfgang Huß
e07a2f88c1 Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-24 16:23:10 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00
Moriz Wahl
ea62a7f710 fix(backend): email verification code never expired 2022-11-22 18:01:36 +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
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
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
ef79580387 required argument client time zone offset for utils in creation 2022-11-15 14:20:33 +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ß
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ß
6d06c0f2d8 Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.test.ts
#	backend/src/seeds/factory/contributionLink.ts
#	backend/src/seeds/factory/creation.ts
2022-10-12 16:23:04 +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ß
a02d8d0edb Get email-template to work the first time 2022-10-05 11:07:16 +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
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
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
elweyn
2d4f88ce84 Refactor logout method from query to mutation. 2022-09-22 11:53:54 +02:00
elweyn
e844bcc925 Change login from Query to Mutation. 2022-09-22 11:47:28 +02:00
joseji
f710fd9b45 fixed await for events redeem register 2022-09-22 11:19:32 +02:00
Claus-Peter Hübner
6c88713f34 start inserting logger.addContext for userid 2022-09-20 16:20:52 +02:00
joseji
1203dada61 ids are now checked in event creation 2022-09-19 19:18:06 +02:00
Claus-Peter Hübner
86b12f98ed set overall resolvers the isolationlevel to REPEATABLE READ 2022-09-16 15:20:51 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
joseji
ded649f342 Events and logs completed in User Resolver 2022-09-15 11:42:03 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00