diff --git a/build/install/win/DocSpace.Enterprise.aip b/build/install/win/DocSpace.Enterprise.aip
index c6068b208d..9268bc5480 100644
--- a/build/install/win/DocSpace.Enterprise.aip
+++ b/build/install/win/DocSpace.Enterprise.aip
@@ -259,8 +259,8 @@
-
-
+
+
@@ -314,7 +314,7 @@
-
+
diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip
index 1947a348e7..4d7421e93a 100644
--- a/build/install/win/DocSpace.aip
+++ b/build/install/win/DocSpace.aip
@@ -597,8 +597,8 @@
-
-
+
+
@@ -652,7 +652,7 @@
-
+
diff --git a/common/ASC.Core.Common/Billing/License/License.cs b/common/ASC.Core.Common/Billing/License/License.cs
index e1cac1a41a..6854b8d749 100644
--- a/common/ASC.Core.Common/Billing/License/License.cs
+++ b/common/ASC.Core.Common/Billing/License/License.cs
@@ -26,29 +26,51 @@
namespace ASC.Core.Billing;
+///
+///
[Serializable]
[DebuggerDisplay("{DueDate}")]
public class License
{
+ /// Original license
+ /// System.String, System
public string OriginalLicense { get; set; }
+
+ /// Specifies if the license is customizable or not
+ /// System.Boolean, System
public bool Customization { get; set; }
+ /// License due date
+ /// System.DateTime, System
[JsonPropertyName("end_date")]
public DateTime DueDate { get; set; }
+
+ /// Specifies if the license is trial or not
+ /// System.Boolean, System
public bool Trial { get; set; }
+ /// Customer ID
+ /// System.String, System
[JsonPropertyName("customer_id")]
public string CustomerId { get; set; }
+ /// Number of document server users
+ /// System.Int32, System
[JsonPropertyName("users_count")]
public int DSUsersCount { get; set; }
+ /// Number of users whose licenses have expired
+ /// System.Int32, System
[JsonPropertyName("users_expire")]
public int DSUsersExpire { get; set; }
+ /// Number of document server connections
+ /// System.Int32, System
[JsonPropertyName("connections")]
public int DSConnections { get; set; }
+ /// License signature
+ /// System.String, System
[JsonPropertyName("signature")]
public string Signature { get; set; }
@@ -139,4 +161,4 @@ public class LicenseConverter : System.Text.Json.Serialization.JsonConverter
+///
public enum AccountLoginType
{
SSO,
diff --git a/common/ASC.Core.Common/Core/Payments.cs b/common/ASC.Core.Common/Core/Payments.cs
index 7133a734e8..36afd5048d 100644
--- a/common/ASC.Core.Common/Core/Payments.cs
+++ b/common/ASC.Core.Common/Core/Payments.cs
@@ -25,6 +25,9 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Core;
+
+///
+///
public enum Payments
{
Paid = 0,
diff --git a/common/ASC.Data.Backup.Core/Service/BackupWorker.cs b/common/ASC.Data.Backup.Core/Service/BackupWorker.cs
index 269fb08e8e..c51b9164eb 100644
--- a/common/ASC.Data.Backup.Core/Service/BackupWorker.cs
+++ b/common/ASC.Data.Backup.Core/Service/BackupWorker.cs
@@ -121,8 +121,9 @@ public class BackupWorker
}
if (item == null)
{
- item = _serviceProvider.GetService();
- item.Init(schedule, false, TempFolder, _limit);
+ item = _serviceProvider.GetService();
+
+ item.Init(schedule, true, TempFolder, _limit);
_progressQueue.EnqueueTask(item);
}
diff --git a/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs b/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs
index 6aafa3a8cc..0b373f55ee 100644
--- a/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs
+++ b/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs
@@ -62,7 +62,7 @@ public class ConfigurationDto
/// ASC.Files.Core.ApiModels.ResponseDto.FileDto, ASC.Files.Core
public FileDto File { get; set; }
- ///
+ /// Error message
/// System.String, System
public string ErrorMessage { get; set; }
}
diff --git a/products/ASC.People/Server/Api/UserController.cs b/products/ASC.People/Server/Api/UserController.cs
index 5d361be1a0..de0ce663b1 100644
--- a/products/ASC.People/Server/Api/UserController.cs
+++ b/products/ASC.People/Server/Api/UserController.cs
@@ -720,7 +720,7 @@ public class UserController : PeopleControllerBase
/// User type
/// Specifies if the user is an administrator or not
/// User payment status
- ///
+ /// Account login type
/// List of users with the detailed information
/// api/2.0/people/filter
/// GET
@@ -814,7 +814,7 @@ public class UserController : PeopleControllerBase
/// User type
/// Specifies if the user is an administrator or not
/// User payment status
- ///
+ /// Account login type
/// List of users
/// api/2.0/people/simple/filter
/// GET
diff --git a/web/ASC.Web.Api/Api/PortalController.cs b/web/ASC.Web.Api/Api/PortalController.cs
index 5f3215c3d7..435180bc63 100644
--- a/web/ASC.Web.Api/Api/PortalController.cs
+++ b/web/ASC.Web.Api/Api/PortalController.cs
@@ -225,7 +225,7 @@ public class PortalController : ControllerBase
/// Get an extra tenant license
///
/// Quota
- ///
+ /// Specifies whether the tariff will be refreshed
/// Extra tenant license information
/// api/2.0/portal/tenantextra
/// GET
@@ -303,7 +303,7 @@ public class PortalController : ControllerBase
/// Get a portal tariff
///
/// Quota
- ///
+ /// Specifies whether the tariff will be refreshed
/// Current portal tariff
/// api/2.0/portal/tariff
/// GET
diff --git a/web/ASC.Web.Api/Api/SmtpSettingsController.cs b/web/ASC.Web.Api/Api/SmtpSettingsController.cs
index 04def6b6f6..694906744e 100644
--- a/web/ASC.Web.Api/Api/SmtpSettingsController.cs
+++ b/web/ASC.Web.Api/Api/SmtpSettingsController.cs
@@ -183,7 +183,7 @@ public class SmtpSettingsController : ControllerBase
// Test the SMTP settings
//
// SMTP settings
- // SMTP operation status
+ // SMTP operation status
// api/2.0/smtpsettings/smtp/test
// GET
[HttpGet("smtp/test")]
@@ -207,7 +207,7 @@ public class SmtpSettingsController : ControllerBase
// Get the SMTP test process status
//
// SMTP settings
- // SMTP operation status
+ // SMTP operation status
// api/2.0/smtpsettings/smtp/test/status
// GET
[HttpGet("smtp/test/status")]
diff --git a/web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs b/web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs
index 507e00bc1b..a42c007f30 100644
--- a/web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs
+++ b/web/ASC.Web.Api/ApiModels/RequestsDto/CookieSettingsRequestsDto.cs
@@ -34,7 +34,7 @@ public class CookieSettingsRequestsDto
/// System.Int32, System
public int LifeTime { get; set; }
- /// Enabled or not
+ /// Specifies if the cookie settings are enabled or not
/// System.Boolean, System
public bool Enabled { get; set; }
}
diff --git a/web/ASC.Web.Api/ApiModels/RequestsDto/SmtpOperationStatusRequestsDto.cs b/web/ASC.Web.Api/ApiModels/RequestsDto/SmtpOperationStatusRequestsDto.cs
index 29846ef353..5badfb39cf 100644
--- a/web/ASC.Web.Api/ApiModels/RequestsDto/SmtpOperationStatusRequestsDto.cs
+++ b/web/ASC.Web.Api/ApiModels/RequestsDto/SmtpOperationStatusRequestsDto.cs
@@ -30,23 +30,23 @@ namespace ASC.Api.Settings.Smtp;
///
public class SmtpOperationStatusRequestsDto
{
- ///
+ /// Specifies if the SMTP operation is completed or not
/// System.Boolean, System
public bool Completed { get; set; }
- ///
+ /// SMTP operation ID
/// System.String, System
public string Id { get; set; }
- ///
+ /// SMTP operation error
/// System.String, System
public string Error { get; set; }
- ///
+ /// SMTP operation status
/// System.String, System
public string Status { get; set; }
- ///
+ /// Percentage of SMTP operation completion
/// System.Int32, System
public int Percents { get; set; }
diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs
index 31e0bd55ee..d62954420a 100644
--- a/web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs
+++ b/web/ASC.Web.Api/ApiModels/ResponseDto/CookieSettingsDto.cs
@@ -34,7 +34,7 @@ public class CookieSettingsDto
/// System.Int32, System
public int LifeTime { get; set; }
- /// Enabled or not
+ /// Specifies if the cookie settings are enabled or not
/// System.Boolean, System
public bool Enabled { get; set; }
}
diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
index cd420d657b..25dbcb17bb 100644
--- a/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
+++ b/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
@@ -134,7 +134,7 @@ public class SettingsDto
/// System.String, System
public string HelpLink { get; set; }
- /// Api docs link
+ /// API documentation link
/// System.String, System
public string ApiDocsLink { get; set; }
@@ -158,7 +158,7 @@ public class SettingsDto
/// System.String, System
public string LegalTerms { get; set; }
- /// Cookie settings enabled
+ /// Specifies whether the cookie settings are enabled
/// System.Boolean, System
public bool CookieSettingsEnabled { get; set; }
diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/SmtpSettingsDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/SmtpSettingsDto.cs
index 898ad75996..e06d45df78 100644
--- a/web/ASC.Web.Api/ApiModels/ResponseDto/SmtpSettingsDto.cs
+++ b/web/ASC.Web.Api/ApiModels/ResponseDto/SmtpSettingsDto.cs
@@ -70,12 +70,12 @@ public class SmtpSettingsDto : IMapFrom
/// false
public bool EnableAuth { get; set; }
- /// Use ntlm or not
+ /// Specifies whether to use NTLM or not
/// System.Boolean, System
/// false
public bool UseNtlm { get; set; }
- /// Is default or not
+ /// Specifies if the current settings are default or not
/// System.Boolean, System
/// false
public bool IsDefaultSettings { get; set; }
diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/TenantExtraDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/TenantExtraDto.cs
index ce7c734790..161c368977 100644
--- a/web/ASC.Web.Api/ApiModels/ResponseDto/TenantExtraDto.cs
+++ b/web/ASC.Web.Api/ApiModels/ResponseDto/TenantExtraDto.cs
@@ -30,43 +30,43 @@ namespace ASC.Web.Api.ApiModels.ResponseDto;
///
public class TenantExtraDto
{
- ///
+ /// Specifies if the extra tenant license is customizable or not
/// System.Boolean, System
public bool CustomMode { get; set; }
- ///
+ /// Specifies if the extra tenant license is Opensource or not
/// System.Boolean, System
public bool Opensource { get; set; }
- ///
+ /// Specifies if the extra tenant license is Enterprise or not
/// System.Boolean, System
public bool Enterprise { get; set; }
- ///
+ /// License tariff
/// ASC.Core.Billing.Tariff, ASC.Core.Common
public Tariff Tariff { get; set; }
- ///
+ /// License quota
/// ASC.Web.Api.ApiModels.ResponseDto.QuotaDto, ASC.Web.Api
public QuotaDto Quota { get; set; }
- ///
+ /// Specifies if the license is paid or not
/// System.Boolean, System
public bool NotPaid { get; set; }
- ///
+ /// The time when the license was accepted
/// System.String, System
public string LicenseAccept { get; set; }
- ///
+ /// Specifies if the tariff page is enabled or not
/// System.Boolean, System
public bool EnableTariffPage { get; set; }
- ///
+ /// Document server user quotas
/// System.Collections.Generic.Dictionary{System.String, System.DateTime}, System.Collections.Generic
public Dictionary DocServerUserQuota { get; set; }
- ///
+ /// Document server license
/// ASC.Core.Billing.License, ASC.Core.Common
public License DocServerLicense { get; set; }
}