Phillip Thelen dbf015f8ca Log social users into matching local auth accounts ...

If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account

2021-11-11 12:43:22 +01:00

..

controllers

fix: I18n string update (#13588)

2021-11-04 16:33:08 -05:00

libs

Log social users into matching local auth accounts

2021-11-11 12:43:22 +01:00

middlewares

Prevent Cron from incorrectly updating loggedIn (#13559)

2021-10-21 17:39:16 -05:00

models

Merge branch 'develop' into release

2021-10-28 13:55:11 -05:00

.eslintrc.js

misc, fix client tests

2019-10-15 15:32:53 +02:00

api-doc.js

chore: update sub-deps and fix lint

2020-07-01 18:20:18 +02:00

index.js

fix(logger): improve logging and make sure no data is lost

2020-03-24 20:29:31 +01:00

server.js

start upgrading eslint

2019-10-08 16:57:10 +02:00