IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9811aaca33
DocSpace-client/common/ASC.FederatedLogin
History
pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop 
# 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
2023-09-25 10:53:06 +03:00
..
Helpers Revert "Revert "backend: removed X-REWRITER-URL header"" 2023-05-10 13:07:24 +03:00
LoginProviders Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
Profile removed Serializable attribute 2023-09-08 16:24:24 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
AccountLinker.cs fixed query 2023-06-28 20:17:22 +03:00
ASC.FederatedLogin.csproj Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
callback.htm Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
GlobalUsings.cs fix usings 2022-11-07 12:34:50 +03:00
Login.cs Revert "Revert "backend: removed X-REWRITER-URL header"" 2023-05-10 13:07:24 +03:00
LoginMode.cs added new license headers 2022-03-15 21:00:53 +03:00
OAuth20Token.cs fix usings 2022-11-07 12:34:50 +03:00
ProviderConstants.cs FederatedLogin: zoom login provider 2023-08-29 14:00:31 +03:00