IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/filter-loader

Browse Source
This commit is contained in:
Viktor Fomin 2020-11-11 16:42:22 +03:00 committed by GitHub
commit 2cc252c2ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
View File

@ -30,7 +30,8 @@ using ASC.Common;
using ASC.Common.Caching;
using ASC.Core;
using ASC.Core.Common.Configuration;
using ASC.FederatedLogin.Helpers;
using Microsoft.Extensions.Configuration;
namespace ASC.FederatedLogin.LoginProviders
@ -74,7 +75,8 @@ namespace ASC.FederatedLogin.LoginProviders
public static DIHelper AddBoxLoginProviderService(this DIHelper services)
{
//services.TryAddScoped<BoxLoginProvider>();
return services
return services
.AddOAuth20TokenHelperService()
.AddConsumerFactoryService()
.AddKafkaService()
.AddTenantManagerService()

3
common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
View File

@ -135,7 +135,8 @@ namespace ASC.FederatedLogin.LoginProviders
public static DIHelper AddDocuSignLoginProviderService(this DIHelper services)
{
//services.TryAddScoped<DocuSignLoginProvider>();
return services
return services
.AddOAuth20TokenHelperService()
.AddConsumerFactoryService()
.AddKafkaService()
.AddTenantManagerService()

6
common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
View File

@ -30,7 +30,8 @@ using ASC.Common;
using ASC.Common.Caching;
using ASC.Core;
using ASC.Core.Common.Configuration;
using ASC.FederatedLogin.Helpers;
using Microsoft.Extensions.Configuration;
namespace ASC.FederatedLogin.LoginProviders
@ -73,7 +74,8 @@ namespace ASC.FederatedLogin.LoginProviders
public static DIHelper AddDropboxLoginProviderService(this DIHelper services)
{
//services.TryAddScoped<DropboxLoginProvider>();
return services
return services
.AddOAuth20TokenHelperService()
.AddConsumerFactoryService()
.AddKafkaService()
.AddTenantManagerService()

1
common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
View File

@ -190,6 +190,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
//services.TryAddScoped<GoogleLoginProvider>();
return services
.AddOAuth20TokenHelperService()
.AddConsumerFactoryService()
.AddKafkaService()
.AddTenantManagerService()

2
common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
View File

@ -30,6 +30,7 @@ using ASC.Common;
using ASC.Common.Caching;
using ASC.Core;
using ASC.Core.Common.Configuration;
using ASC.FederatedLogin.Helpers;
using Microsoft.Extensions.Configuration;
@ -79,6 +80,7 @@ namespace ASC.FederatedLogin.LoginProviders
{
//services.TryAddScoped<OneDriveLoginProvider>();
return services
.AddOAuth20TokenHelperService()
.AddConsumerFactoryService()
.AddKafkaService()
.AddTenantManagerService()

2
products/ASC.Files/Client/yarn.lock
View File

@ -2189,7 +2189,7 @@ asap@~2.0.6:
sjcl "^1.0.8"
"asc-web-components@file:../../../packages/asc-web-components":
version "1.0.483"
version "1.0.484"
dependencies:
email-addresses "^3.1.0"
html-to-react "^1.4.2"

2
products/ASC.People/Client/yarn.lock
View File

@ -2182,7 +2182,7 @@ asap@~2.0.6:
sjcl "^1.0.8"
"asc-web-components@file:../../../packages/asc-web-components":
version "1.0.483"
version "1.0.484"
dependencies:
email-addresses "^3.1.0"
html-to-react "^1.4.2"

2
web/ASC.Web.Client/yarn.lock
View File

@ -2182,7 +2182,7 @@ asap@~2.0.6:
sjcl "^1.0.8"
"asc-web-components@file:../../packages/asc-web-components":
version "1.0.483"
version "1.0.484"
dependencies:
email-addresses "^3.1.0"
html-to-react "^1.4.2"

2
web/ASC.Web.Common/yarn.lock
View File

@ -3126,7 +3126,7 @@ arrify@^1.0.1:
integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
"asc-web-components@file:../../packages/asc-web-components":
version "1.0.483"
version "1.0.484"
dependencies:
email-addresses "^3.1.0"
html-to-react "^1.4.2"

2
web/ASC.Web.Components/package.json
View File

@ -1,6 +1,6 @@
{
"name": "asc-web-components",
"version": "1.0.483",
"version": "1.0.484",
"description": "Ascensio System SIA component library",
"license": "AGPL-3.0",
"main": "dist/asc-web-components.js",

2
web/ASC.Web.Components/src/components/aside/aside.js
View File

@ -20,7 +20,7 @@ const StyledAside = styled(Container)`
right: 0;
top: 0;
transform: translateX(
${(props) => (props.visible ? "0" : props.scale ? "100%" : "320px")}
${(props) => (props.visible ? "0" : props.scale ? "100%" : "325px")}
);
transition: transform 0.3s ease-in-out;
width: ${(props) => (props.scale ? "100%" : "325px")};