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

fixed 62955

Browse Source
This commit is contained in:
pavelbannov 2023-06-12 23:54:10 +03:00
parent d9367bf4bc
commit baa18cab8b
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/Tenants/TenantQuota.cs
View File

@ -241,7 +241,7 @@ public class TenantQuota : IMapFrom<DbQuota>
_autoBackupRestoreFeature = new TenantQuotaFeatureFlag(this) { Name = "restore", Order = 6 };
_oauthFeature = new TenantQuotaFeatureFlag(this) { Name = "oauth", Visible = false };
_contentSearchFeature = new TenantQuotaFeatureFlag(this) { Name = "contentsearch", Visible = false };
_thirdPartyFeature = new TenantQuotaFeatureFlag(this) { Name = "thirdparty" };
_thirdPartyFeature = new TenantQuotaFeatureFlag(this) { Name = "thirdparty", Order = 9 };
TenantQuotaFeatures = new List<TenantQuotaFeature>
{

2
web/ASC.Web.Api/ASC.Web.Api.csproj
View File

@ -26,6 +26,7 @@
<None Remove="img\restore.svg" />
<None Remove="img\room.svg" />
<None Remove="img\sso.svg" />
<None Remove="img\thirdparty.svg" />
<None Remove="img\total_size.svg" />
<None Remove="img\users.svg" />
<None Remove="img\whitelabel.svg" />
@ -35,6 +36,7 @@
<EmbeddedResource Include="img\restore.svg" />
<EmbeddedResource Include="img\room.svg" />
<EmbeddedResource Include="img\sso.svg" />
<EmbeddedResource Include="img\thirdparty.svg" />
<EmbeddedResource Include="img\total_size.svg" />
<EmbeddedResource Include="img\users.svg" />
<EmbeddedResource Include="img\whitelabel.svg" />

13
web/ASC.Web.Api/img/thirdparty.svg Normal file
View File

@ -0,0 +1,13 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_43880_80889)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.25 13C4.83579 13 4.5 13.3358 4.5 13.75C4.5 13.839 4.51519 13.9228 4.54248 14.0001C4.62362 14.2296 4.58828 14.4843 4.44771 14.683C4.30713 14.8818 4.07882 15 3.83535 15H1.5V21.25C1.5 21.9404 2.05964 22.5 2.75 22.5H9V20.9863C7.87501 20.8619 7 19.9081 7 18.75C7 17.5919 7.87501 16.6381 9 16.5137V15H6.66465C6.42118 15 6.19287 14.8818 6.05229 14.683C5.91172 14.4843 5.87638 14.2296 5.95752 14.0001C5.98482 13.9228 6 13.839 6 13.75C6 13.3358 5.66421 13 5.25 13ZM3.01373 13.5C3.13809 12.375 4.09186 11.5 5.25 11.5C6.40814 11.5 7.36191 12.375 7.48627 13.5H9.75C10.1642 13.5 10.5 13.8358 10.5 14.25V17.3354C10.5 17.5788 10.3818 17.8071 10.183 17.9477C9.98426 18.0883 9.72961 18.1236 9.50006 18.0425C9.42283 18.0152 9.339 18 9.25 18C8.83579 18 8.5 18.3358 8.5 18.75C8.5 19.1642 8.83579 19.5 9.25 19.5C9.339 19.5 9.42283 19.4848 9.50006 19.4575C9.72961 19.3764 9.98426 19.4117 10.183 19.5523C10.3818 19.6929 10.5 19.9212 10.5 20.1646V23.25C10.5 23.6642 10.1642 24 9.75 24H2.75C1.23122 24 0 22.7688 0 21.25V14.25C0 13.8358 0.335786 13.5 0.75 13.5H3.01373Z" fill="#657077"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.75 11C19.1642 11 19.5 10.6642 19.5 10.25C19.5 10.161 19.4848 10.0772 19.4575 9.99993C19.3764 9.77039 19.4117 9.51574 19.5523 9.31696C19.6929 9.11818 19.9212 9 20.1646 9H22.5V2.75C22.5 2.05964 21.9404 1.5 21.25 1.5H15V3.01373C16.125 3.13809 17 4.09186 17 5.25C17 6.40814 16.125 7.36191 15 7.48627V9H17.3354C17.5788 9 17.8071 9.11818 17.9477 9.31696C18.0883 9.51574 18.1236 9.77039 18.0425 9.99994C18.0152 10.0772 18 10.161 18 10.25C18 10.6642 18.3358 11 18.75 11ZM20.9863 10.5C20.8619 11.625 19.9081 12.5 18.75 12.5C17.5919 12.5 16.6381 11.625 16.5137 10.5H14.25C13.8358 10.5 13.5 10.1642 13.5 9.75V6.66465C13.5 6.42118 13.6182 6.19287 13.817 6.05229C14.0157 5.91172 14.2704 5.87638 14.4999 5.95752C14.5772 5.98482 14.661 6 14.75 6C15.1642 6 15.5 5.66421 15.5 5.25C15.5 4.83579 15.1642 4.5 14.75 4.5C14.661 4.5 14.5772 4.51518 14.4999 4.54248C14.2704 4.62362 14.0157 4.58828 13.817 4.44771C13.6182 4.30713 13.5 4.07882 13.5 3.83535V0.75C13.5 0.335787 13.8358 0 14.25 0H21.25C22.7688 0 24 1.23122 24 2.75V9.75C24 10.1642 23.6642 10.5 23.25 10.5H20.9863Z" fill="#657077"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 9.75C11 9.33579 10.6642 9 10.25 9C10.161 9 10.0772 9.01519 9.99993 9.04248C9.77039 9.12362 9.51574 9.08828 9.31696 8.94771C9.11818 8.80713 9 8.57882 9 8.33535V6L2.75 6C2.05964 6 1.5 6.55964 1.5 7.25V13.5H3.01373C3.13809 12.375 4.09186 11.5 5.25 11.5C6.40814 11.5 7.36191 12.375 7.48627 13.5H9V11.1646C9 10.9212 9.11818 10.6929 9.31696 10.5523C9.51574 10.4117 9.77039 10.3764 9.99994 10.4575C10.0772 10.4848 10.161 10.5 10.25 10.5C10.6642 10.5 11 10.1642 11 9.75ZM10.5 7.51373C11.625 7.63809 12.5 8.59186 12.5 9.75C12.5 10.9081 11.625 11.8619 10.5 11.9863V14.25C10.5 14.6642 10.1642 15 9.75 15H6.66465C6.42118 15 6.19287 14.8818 6.05229 14.683C5.91172 14.4843 5.87638 14.2296 5.95752 14.0001C5.98482 13.9228 6 13.839 6 13.75C6 13.3358 5.66421 13 5.25 13C4.83579 13 4.5 13.3358 4.5 13.75C4.5 13.839 4.51518 13.9228 4.54248 14.0001C4.62362 14.2296 4.58828 14.4843 4.44771 14.683C4.30713 14.8818 4.07882 15 3.83535 15H0.75C0.335787 15 0 14.6642 0 14.25V7.25C0 5.73122 1.23122 4.5 2.75 4.5L9.75 4.5C10.1642 4.5 10.5 4.83579 10.5 5.25V7.51373Z" fill="#657077"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 18.75C8.5 19.1642 8.83579 19.5 9.25 19.5C9.339 19.5 9.42283 19.4848 9.50007 19.4575C9.72961 19.3764 9.98426 19.4117 10.183 19.5523C10.3818 19.6929 10.5 19.9212 10.5 20.1646V22.5H16.75C17.4404 22.5 18 21.9404 18 21.25V15H16.4863C16.3619 16.125 15.4081 17 14.25 17C13.0919 17 12.1381 16.125 12.0137 15H10.5V17.3354C10.5 17.5788 10.3818 17.8071 10.183 17.9477C9.98426 18.0883 9.72961 18.1236 9.50006 18.0425C9.42283 18.0152 9.339 18 9.25 18C8.83579 18 8.5 18.3358 8.5 18.75ZM9 20.9863C7.87501 20.8619 7 19.9081 7 18.75C7 17.5919 7.87501 16.6381 9 16.5137V14.25C9 13.8358 9.33579 13.5 9.75 13.5H12.8354C13.0788 13.5 13.3071 13.6182 13.4477 13.817C13.5883 14.0157 13.6236 14.2704 13.5425 14.4999C13.5152 14.5772 13.5 14.661 13.5 14.75C13.5 15.1642 13.8358 15.5 14.25 15.5C14.6642 15.5 15 15.1642 15 14.75C15 14.661 14.9848 14.5772 14.9575 14.4999C14.8764 14.2704 14.9117 14.0157 15.0523 13.817C15.1929 13.6182 15.4212 13.5 15.6646 13.5H18.75C19.1642 13.5 19.5 13.8358 19.5 14.25V21.25C19.5 22.7688 18.2688 24 16.75 24H9.75C9.33579 24 9 23.6642 9 23.25V20.9863Z" fill="#657077"/>
</g>
<defs>
<clipPath id="clip0_43880_80889">
<rect width="24" height="24" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

9
web/ASC.Web.Core/PublicResources/Resource.Designer.cs generated
View File

@ -2697,6 +2697,15 @@ namespace ASC.Web.Core.PublicResources {
}
}
/// <summary>
/// Looks up a localized string similar to Third-party integrations.
/// </summary>
public static string TariffsFeature_thirdparty {
get {
return ResourceManager.GetString("TariffsFeature_thirdparty", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} storage space.
/// </summary>

7
web/ASC.Web.Core/PublicResources/Resource.resx
View File

@ -53,10 +53,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ActivateMobilePhoneEmptyCode" xml:space="preserve">
<value>Validation code field cannot be empty</value>
@ -988,4 +988,7 @@
<data name="WhatsNewSubscriptionName" xml:space="preserve">
<value>What's New</value>
</data>
<data name="TariffsFeature_thirdparty" xml:space="preserve">
<value>Third-party integrations</value>
</data>
</root>