332 Commits

Author SHA1 Message Date
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
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
Claus-Peter Hübner
97dee4d67c adapt tests to work with User and UserContact 2022-09-02 02:34:45 +02:00
Claus-Peter Hübner
a0fe5f7951 adapt UserResolverTest to work with Users and UserContacts 2022-09-01 01:07:25 +02:00
Claus-Peter Hübner
faa0500f10 adapt seeding using User and UserContact 2022-08-31 15:44:41 +02:00
Claus-Peter Hübner
852c4e6499 change seeding now with UserContacts entry 2022-08-31 01:12:12 +02:00
Claus-Peter Hübner
7269b4b67b solve problems reading user with emailcontact 2022-08-30 00:57:57 +02:00
Claus-Peter Hübner
228451574d adapt backend on database migration of UserContacts 2022-08-26 02:28:04 +02:00
Claus-Peter Hübner
ab1dd4a2c8 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-25 00:20:20 +02:00
Claus-Peter Hübner
e946d96efe Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-18 19:07:33 +02:00
Alexander Friedland
46626441d4
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-18 08:09:56 +02:00
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
elweyn
beb563ac5c Fix changes. 2022-08-17 10:05:56 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
Alexander Friedland
5d4670083f
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-17 09:14:21 +02:00
Claus-Peter Hübner
72e1de9f78 Merge remote-tracking branch 'origin/master' into
2125-feature-gradido-id-new-column-gradidoid-in-users-table
2022-08-16 17:10:15 +02:00
Claus-Peter Hübner
e876f32ad5 initialize gradidoID of fakedUser per uuidv4() instead of constant 2022-08-16 17:05:31 +02:00
ogerly
73cf9bc8cc add dutch and frence 2022-08-16 11:54:11 +02:00
elweyn
b41f34a3dd Merge master into this branch. 2022-08-15 11:03:58 +02:00
Hannes Heine
24ce920ecc
Merge branch 'master' into 2105-add-emailChecked-to-opt-in-check 2022-08-11 14:56:36 +02:00
elweyn
c46f2f241e Create resolver method to query admin and moderator users. 2022-08-10 11:28:21 +02:00
Claus-Peter Hübner
cd71bf7661 linting 2022-08-09 23:59:13 +02:00
Claus-Peter Hübner
35da60c572 change User to create a gradidoID as uuidv4 during createUser 2022-08-09 23:36:00 +02:00
Claus-Peter Hübner
fadbc7068e start adaptions of users changes in backend 2022-08-09 03:56:22 +02:00
ogerly
dec15c24ca refactor UserResolver.ts 2022-08-07 22:41:57 +02:00
elweyn
3a183918c5 Change checkOptInCode to check if emailChecked before changing optInState. 2022-08-04 11:34:46 +02:00
Claus-Peter Hübner
86a0ab731f adapt UserResolver and Test to database changes 2022-07-21 23:18:31 +02:00
Claus-Peter Hübner
63d84199b0 linting 2022-07-13 02:06:36 +02:00
Claus-Peter Hübner
1a2bb1a29a add eventSendConfirmEmail during createUser() 2022-07-13 01:59:37 +02:00