DmitrySychugov 2fc16bc9ec Merge remote-tracking branch 'remotes/origin/develop' into feature/management ... # Conflicts: # build/build.backend.docker.ps1 # build/build.backend.docker.sh # build/build.static.bat # build/clear.backend.docker.ps1 # build/clear.backend.docker.sh # build/install/docker/Dockerfile # build/install/docker/Dockerfile.runtime # build/install/docker/config/nginx/templates/upstream.conf.template # build/install/docker/docspace.overcome.yml # build/install/docker/docspace.profiles.yml # build/start/start.backend.docker.ps1 # build/start/start.backend.docker.sh # common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs # common/ASC.Core.Common/Caching/CachedTenantService.cs # common/ASC.Core.Common/Core/TenantRegistrationInfo.cs # common/ASC.Core.Common/HostedSolution.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # common/ASC.Data.Backup.Core/BackupAjaxHandler.cs # common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs # common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs # common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs # common/ASC.Data.Backup.Core/Service/BackupService.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs # common/services/ASC.ApiSystem/ASC.ApiSystem.csproj # common/services/ASC.ApiSystem/Classes/CommonMethods.cs # common/services/ASC.ApiSystem/Controllers/PortalController.cs # common/services/ASC.ApiSystem/Controllers/SettingsController.cs # common/services/ASC.ApiSystem/GlobalUsings.cs # common/services/ASC.ApiSystem/Models/SettingsModel.cs # common/services/ASC.ApiSystem/Startup.cs # common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs # common/services/ASC.Data.Backup/Api/BackupController.cs # common/services/ASC.Data.Backup/ApiModels/BackupDto.cs # common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs # common/services/ASC.Data.Backup/GlobalUsings.cs # config/nginx/onlyoffice.conf # migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs # migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs # package.json # packages/client/package.json # packages/client/src/pages/Confirm/sub-components/auth.js # packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js # packages/client/src/pages/PortalSettings/categories/common/branding.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js # packages/client/src/pages/PortalSettings/categories/data-management/index.js # packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/index.js # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs # web/ASC.Web.Core/Utility/TenantExtra.cs # yarn.lock		2023-10-04 16:27:12 +05:00
..
css	Web:Added new fonts open sans v35	2023-08-03 19:44:53 +05:00
fonts/v35	Web: Removed old fonts	2023-08-03 19:47:52 +05:00
images	Merge remote-tracking branch 'remotes/origin/develop' into feature/management	2023-10-04 16:27:12 +05:00
locales	Merge remote-tracking branch 'remotes/origin/develop' into feature/management	2023-10-04 16:27:12 +05:00
offline
scripts	Merge remote-tracking branch 'remotes/origin/develop' into feature/management	2023-10-04 16:27:12 +05:00
thirdparty
appIcon-180.png
appIcon-192.png
appIcon-512.png
favicon.ico
icon.svg
manifest.json