pavelbannov
b14d6c8ef0
# Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Data.Storage/StorageHandler.cs # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # config/appsettings.json # config/nlog.config # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs # packages/client/src/pages/Confirm/sub-components/createUser.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/common/components/MoreLoginModal/index.tsx # packages/login/src/client/components/sub-components/LoginForm.tsx # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Core/CspSettingsHelper.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock |
||
---|---|---|
.. | ||
AppleIdLoginProvider.cs | ||
BaseLoginProvider.cs | ||
BitlyLoginProvider.cs | ||
BoxLoginProvider.cs | ||
DocuSignLoginProvider.cs | ||
DropboxLoginProvider.cs | ||
EncryptionLoginProvider.cs | ||
FacebookLoginProvider.cs | ||
GoogleLoginProvider.cs | ||
GosUslugiLoginProvider.cs | ||
ILoginProvider.cs | ||
IValidateKeysProvider.cs | ||
LinkedInLoginProvider.cs | ||
MailRuLoginProvider.cs | ||
MicrosoftLoginProvider.cs | ||
OneDriveLoginProvider.cs | ||
ProviderManager.cs | ||
TelegramLoginProvider.cs | ||
TwitterLoginProvider.cs | ||
VKLoginProvider.cs | ||
WordpressLoginProvider.cs | ||
YandexLoginProvider.cs | ||
ZoomLoginProvider.cs |