Tatiana Lopaeva
aa6c02b190
# Conflicts: # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # packages/asc-web-common/api/settings/index.js # packages/asc-web-common/components/PrivateRoute/index.js # packages/asc-web-common/store/SettingsStore.js # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/ru/SelectFile.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/Shell.jsx |
||
---|---|---|
.. | ||
Smtp | ||
AuthModel.cs | ||
AuthServiceModel.cs | ||
BuildVersion.cs | ||
CapabilitiesData.cs | ||
EncryptionSettingsModel.cs | ||
EventWrapper.cs | ||
FirebaseWrapper.cs | ||
GreetingSettingsModel.cs | ||
IpRestrictionsModel.cs | ||
MailDomainSettingsModel.cs | ||
MailWhiteLabelSettingsModel.cs | ||
MobileAppModel.cs | ||
QuotaWrapper.cs | ||
SchemaModel.cs | ||
SecurityModel.cs | ||
SecurityWrapper.cs | ||
SettingsModel.cs | ||
SettingsWrapper.cs | ||
ShortenLinkModel.cs | ||
StatisticsWrapper.cs | ||
StorageEncryptionModel.cs | ||
StorageModel.cs | ||
StorageWrapper.cs | ||
TenantVersionWrapper.cs | ||
TfaModel.cs | ||
TfaSettings.cs | ||
ThirdpartyModel.cs | ||
TimezonesModel.cs | ||
UploadLicenseModel.cs | ||
WebItemSecurityModel.cs | ||
WhiteLabelModel.cs | ||
WizardModel.cs |