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

Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2

Browse Source
This commit is contained in:
Ilya Oleshko 2023-08-04 14:14:10 +03:00
commit e43a37dde6
16 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/install/win/DocSpace.Enterprise.aip
View File

@ -259,8 +259,8 @@
<ROW Dialog_="ELKConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="ELKConnectionDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="ELKConnectionDlg" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="ELKConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Настройка подключения Elasticsearch..." Order="700"/>
<ROW Dialog_="ELKConnectionDlg" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Elasticsearch настройки подключения" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="ELKConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Configure Elasticsearch Connection..." Order="700"/>
<ROW Dialog_="ELKConnectionDlg" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Elasticsearch connection settings" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="ELKConnectionDlg" Control="ProtocolLabel" Type="Text" X="25" Y="65" Width="67" Height="11" Attributes="65539" Text="Protocol" Order="900"/>
<ROW Dialog_="ELKConnectionDlg" Control="ServerLabel" Type="Text" X="25" Y="92" Width="67" Height="11" Attributes="65539" Text="Server:" Order="1000"/>
<ROW Dialog_="ELKConnectionDlg" Control="PortLabel" Type="Text" X="25" Y="119" Width="67" Height="11" Attributes="65539" Text="Port:" Order="1100"/>
@ -314,7 +314,7 @@
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="[BannerBitmap]" Order="400"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Attributes="196611" Text="Configure PostgreSQL Connection..." Order="700"/>

6
build/install/win/DocSpace.aip
View File

@ -597,8 +597,8 @@
<ROW Dialog_="ELKConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="ELKConnectionDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="ELKConnectionDlg" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="ELKConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Настройка подключения Elasticsearch..." Order="700"/>
<ROW Dialog_="ELKConnectionDlg" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Elasticsearch настройки подключения" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="ELKConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Attributes="196611" Text="Configure Elasticsearch Connection..." Order="700"/>
<ROW Dialog_="ELKConnectionDlg" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Elasticsearch connection settings" TextStyle="[DlgTitleFont]" Order="800"/>
<ROW Dialog_="ELKConnectionDlg" Control="ProtocolLabel" Type="Text" X="25" Y="65" Width="67" Height="11" Attributes="65539" Text="Protocol" Order="900"/>
<ROW Dialog_="ELKConnectionDlg" Control="ServerLabel" Type="Text" X="25" Y="92" Width="67" Height="11" Attributes="65539" Text="Server:" Order="1000"/>
<ROW Dialog_="ELKConnectionDlg" Control="PortLabel" Type="Text" X="25" Y="119" Width="67" Height="11" Attributes="65539" Text="Port:" Order="1100"/>
@ -652,7 +652,7 @@
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" Options="1"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="[BannerBitmap]" Order="400"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="banner.bmp" Order="400"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
<ROW Dialog_="PostgreSQLConnectionDlg" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Attributes="196611" Text="Configure PostgreSQL Connection..." Order="700"/>

24
common/ASC.Core.Common/Billing/License/License.cs
View File

@ -26,29 +26,51 @@
namespace ASC.Core.Billing;
/// <summary>
/// </summary>
[Serializable]
[DebuggerDisplay("{DueDate}")]
public class License
{
/// <summary>Original license</summary>
/// <type>System.String, System</type>
public string OriginalLicense { get; set; }
/// <summary>Specifies if the license is customizable or not</summary>
/// <type>System.Boolean, System</type>
public bool Customization { get; set; }
/// <summary>License due date</summary>
/// <type>System.DateTime, System</type>
[JsonPropertyName("end_date")]
public DateTime DueDate { get; set; }
/// <summary>Specifies if the license is trial or not</summary>
/// <type>System.Boolean, System</type>
public bool Trial { get; set; }
/// <summary>Customer ID</summary>
/// <type>System.String, System</type>
[JsonPropertyName("customer_id")]
public string CustomerId { get; set; }
/// <summary>Number of document server users</summary>
/// <type>System.Int32, System</type>
[JsonPropertyName("users_count")]
public int DSUsersCount { get; set; }
/// <summary>Number of users whose licenses have expired</summary>
/// <type>System.Int32, System</type>
[JsonPropertyName("users_expire")]
public int DSUsersExpire { get; set; }
/// <summary>Number of document server connections</summary>
/// <type>System.Int32, System</type>
[JsonPropertyName("connections")]
public int DSConnections { get; set; }
/// <summary>License signature</summary>
/// <type>System.String, System</type>
[JsonPropertyName("signature")]
public string Signature { get; set; }
@ -139,4 +161,4 @@ public class LicenseConverter : System.Text.Json.Serialization.JsonConverter<obj
{
return;
}
}
}

2
common/ASC.Core.Common/Core/AccountLoginType.cs
View File

@ -26,6 +26,8 @@
namespace ASC.Core;
/// <summary>
/// </summary>
public enum AccountLoginType
{
SSO,

3
common/ASC.Core.Common/Core/Payments.cs
View File

@ -25,6 +25,9 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Core;
/// <summary>
/// </summary>
public enum Payments
{
Paid = 0,

5
common/ASC.Data.Backup.Core/Service/BackupWorker.cs
View File

@ -121,8 +121,9 @@ public class BackupWorker
}
if (item == null)
{
item = _serviceProvider.GetService<BackupProgressItem>();
item.Init(schedule, false, TempFolder, _limit);
item = _serviceProvider.GetService<BackupProgressItem>();
item.Init(schedule, true, TempFolder, _limit);
_progressQueue.EnqueueTask(item);
}

2
products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs
View File

@ -62,7 +62,7 @@ public class ConfigurationDto<T>
/// <type>ASC.Files.Core.ApiModels.ResponseDto.FileDto, ASC.Files.Core</type>
public FileDto<T> File { get; set; }
/// <summary></summary>
/// <summary>Error message</summary>
/// <type>System.String, System</type>
public string ErrorMessage { get; set; }
}

4
products/ASC.People/Server/Api/UserController.cs
View File

@ -720,7 +720,7 @@ public class UserController : PeopleControllerBase
/// <param type="System.Nullable{ASC.Core.Users.EmployeeType}, System" name="employeeType">User type</param>
/// <param type="System.Nullable{System.Boolean}, System" name="isAdministrator">Specifies if the user is an administrator or not</param>
/// <param type="System.Nullable{ASC.Core.Payments}, System" name="payments">User payment status</param>
/// <param name="accountLoginType"></param>
/// <param type="System.Nullable{ASC.Core.AccountLoginType}, System" name="accountLoginType">Account login type</param>
/// <returns type="ASC.Web.Api.Models.EmployeeFullDto, ASC.Api.Core">List of users with the detailed information</returns>
/// <path>api/2.0/people/filter</path>
/// <httpMethod>GET</httpMethod>
@ -814,7 +814,7 @@ public class UserController : PeopleControllerBase
/// <param type="System.Nullable{ASC.Core.Users.EmployeeType}, System" name="employeeType">User type</param>
/// <param type="System.Nullable{System.Boolean}, System" name="isAdministrator">Specifies if the user is an administrator or not</param>
/// <param type="System.Nullable{ASC.Core.Payments}, System" name="payments">User payment status</param>
/// <param name="accountLoginType"></param>
/// <param type="System.Nullable{ASC.Core.AccountLoginType}, System" name="accountLoginType">Account login type</param>
/// <returns type="ASC.Web.Api.Models.EmployeeDto, ASC.Api.Core">List of users</returns>
/// <path>api/2.0/people/simple/filter</path>
/// <httpMethod>GET</httpMethod>

4
web/ASC.Web.Api/Api/PortalController.cs
View File

@ -225,7 +225,7 @@ public class PortalController : ControllerBase
/// Get an extra tenant license
/// </short>
/// <category>Quota</category>
/// <param type="System.Boolean, System" name="refresh"></param>
/// <param type="System.Boolean, System" name="refresh">Specifies whether the tariff will be refreshed</param>
/// <returns type="ASC.Web.Api.ApiModels.ResponseDto, ASC.Web.Api">Extra tenant license information</returns>
/// <path>api/2.0/portal/tenantextra</path>
/// <httpMethod>GET</httpMethod>
@ -303,7 +303,7 @@ public class PortalController : ControllerBase
/// Get a portal tariff
/// </short>
/// <category>Quota</category>
/// <param type="System.Boolean, System" name="refresh"></param>
/// <param type="System.Boolean, System" name="refresh">Specifies whether the tariff will be refreshed</param>
/// <returns type="ASC.Core.Billing.Tariff, ASC.Core.Common">Current portal tariff</returns>
/// <path>api/2.0/portal/tariff</path>
/// <httpMethod>GET</httpMethod>

4
web/ASC.Web.Api/Api/SmtpSettingsController.cs
View File

@ -183,7 +183,7 @@ public class SmtpSettingsController : ControllerBase
// Test the SMTP settings
// </short>
// <category>SMTP settings</category>
// <returns type="ASC.Api.Settings.Smtp.SmtpOperationStatusRequestsDto, ASC.Api.Settings.Smtp">SMTP operation status</returns>
// <returns type="ASC.Api.Settings.Smtp.SmtpOperationStatusRequestsDto, ASC.Web.Api">SMTP operation status</returns>
// <path>api/2.0/smtpsettings/smtp/test</path>
// <httpMethod>GET</httpMethod>
[HttpGet("smtp/test")]
@ -207,7 +207,7 @@ public class SmtpSettingsController : ControllerBase
// Get the SMTP test process status
// </short>
// <category>SMTP settings</category>
// <returns type="ASC.Api.Settings.Smtp.SmtpOperationStatusRequestsDto, ASC.Api.Settings.Smtp">SMTP operation status</returns>
// <returns type="ASC.Api.Settings.Smtp.SmtpOperationStatusRequestsDto, ASC.Web.Api">SMTP operation status</returns>
// <path>api/2.0/smtpsettings/smtp/test/status</path>
// <httpMethod>GET</httpMethod>
[HttpGet("smtp/test/status")]

2
web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs
View File

@ -34,7 +34,7 @@ public class CookieSettingsRequestsDto
/// <type>System.Int32, System</type>
public int LifeTime { get; set; }
/// <summary>Enabled or not</summary>
/// <summary>Specifies if the cookie settings are enabled or not</summary>
/// <type>System.Boolean, System</type>
public bool Enabled { get; set; }
}

10
web/ASC.Web.Api/ApiModels/RequestsDto/SmtpOperationStatusRequestsDto.cs
View File

@ -30,23 +30,23 @@ namespace ASC.Api.Settings.Smtp;
/// </summary>
public class SmtpOperationStatusRequestsDto
{
/// <summary></summary>
/// <summary>Specifies if the SMTP operation is completed or not</summary>
/// <type>System.Boolean, System</type>
public bool Completed { get; set; }
/// <summary></summary>
/// <summary>SMTP operation ID</summary>
/// <type>System.String, System</type>
public string Id { get; set; }
/// <summary></summary>
/// <summary>SMTP operation error</summary>
/// <type>System.String, System</type>
public string Error { get; set; }
/// <summary></summary>
/// <summary>SMTP operation status</summary>
/// <type>System.String, System</type>
public string Status { get; set; }
/// <summary></summary>
/// <summary>Percentage of SMTP operation completion</summary>
/// <type>System.Int32, System</type>
public int Percents { get; set; }

2
web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs
View File

@ -34,7 +34,7 @@ public class CookieSettingsDto
/// <type>System.Int32, System</type>
public int LifeTime { get; set; }
/// <summary>Enabled or not</summary>
/// <summary>Specifies if the cookie settings are enabled or not</summary>
/// <type>System.Boolean, System</type>
public bool Enabled { get; set; }
}

4
web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
View File

@ -134,7 +134,7 @@ public class SettingsDto
/// <type>System.String, System</type>
public string HelpLink { get; set; }
/// <summary>Api docs link</summary>
/// <summary>API documentation link</summary>
/// <type>System.String, System</type>
public string ApiDocsLink { get; set; }
@ -158,7 +158,7 @@ public class SettingsDto
/// <type>System.String, System</type>
public string LegalTerms { get; set; }
/// <summary>Cookie settings enabled</summary>
/// <summary>Specifies whether the cookie settings are enabled</summary>
/// <type>System.Boolean, System</type>
public bool CookieSettingsEnabled { get; set; }

4
web/ASC.Web.Api/ApiModels/ResponseDto/SmtpSettingsDto.cs
View File

@ -70,12 +70,12 @@ public class SmtpSettingsDto : IMapFrom<SmtpSettings>
/// <example>false</example>
public bool EnableAuth { get; set; }
/// <summary>Use ntlm or not</summary>
/// <summary>Specifies whether to use NTLM or not</summary>
/// <type>System.Boolean, System</type>
/// <example>false</example>
public bool UseNtlm { get; set; }
/// <summary>Is default or not</summary>
/// <summary>Specifies if the current settings are default or not</summary>
/// <type>System.Boolean, System</type>
/// <example>false</example>
public bool IsDefaultSettings { get; set; }

20
web/ASC.Web.Api/ApiModels/ResponseDto/TenantExtraDto.cs
View File

@ -30,43 +30,43 @@ namespace ASC.Web.Api.ApiModels.ResponseDto;
/// </summary>
public class TenantExtraDto
{
/// <summary></summary>
/// <summary>Specifies if the extra tenant license is customizable or not</summary>
/// <type>System.Boolean, System</type>
public bool CustomMode { get; set; }
/// <summary></summary>
/// <summary>Specifies if the extra tenant license is Opensource or not</summary>
/// <type>System.Boolean, System</type>
public bool Opensource { get; set; }
/// <summary></summary>
/// <summary>Specifies if the extra tenant license is Enterprise or not</summary>
/// <type>System.Boolean, System</type>
public bool Enterprise { get; set; }
/// <summary></summary>
/// <summary>License tariff</summary>
/// <type>ASC.Core.Billing.Tariff, ASC.Core.Common</type>
public Tariff Tariff { get; set; }
/// <summary></summary>
/// <summary>License quota</summary>
/// <type>ASC.Web.Api.ApiModels.ResponseDto.QuotaDto, ASC.Web.Api</type>
public QuotaDto Quota { get; set; }
/// <summary></summary>
/// <summary>Specifies if the license is paid or not</summary>
/// <type>System.Boolean, System</type>
public bool NotPaid { get; set; }
/// <summary></summary>
/// <summary>The time when the license was accepted</summary>
/// <type>System.String, System</type>
public string LicenseAccept { get; set; }
/// <summary></summary>
/// <summary>Specifies if the tariff page is enabled or not</summary>
/// <type>System.Boolean, System</type>
public bool EnableTariffPage { get; set; }
/// <summary></summary>
/// <summary>Document server user quotas</summary>
/// <type>System.Collections.Generic.Dictionary{System.String, System.DateTime}, System.Collections.Generic</type>
public Dictionary<string, DateTime> DocServerUserQuota { get; set; }
/// <summary></summary>
/// <summary>Document server license</summary>
/// <type>ASC.Core.Billing.License, ASC.Core.Common</type>
public License DocServerLicense { get; set; }
}