Alexey Safronov 3aeac42444 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Data/DbSubscriptionService.cs # common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs # common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs # common/services/ASC.ElasticSearch/Service/Settings.cs # common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj # common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs # packages/asc-web-components/combobox/index.js # packages/asc-web-components/table-container/StyledTableContainer.js # packages/asc-web-components/table-container/TableGroupMenu.js # packages/asc-web-components/table-container/TableHeader.js # packages/asc-web-components/table-container/TableHeaderCell.js # packages/asc-web-components/table-container/TableRow.js # products/ASC.Files/Client/public/locales/az/Home.json # products/ASC.Files/Client/public/locales/bg/Home.json # products/ASC.Files/Client/public/locales/bg/Translations.json # products/ASC.Files/Client/public/locales/cs/Home.json # products/ASC.Files/Client/public/locales/de/ConvertDialog.json # products/ASC.Files/Client/public/locales/de/Home.json # products/ASC.Files/Client/public/locales/de/Translations.json # products/ASC.Files/Client/public/locales/de/UploadPanel.json # products/ASC.Files/Client/public/locales/el/ConvertDialog.json # products/ASC.Files/Client/public/locales/el/Home.json # products/ASC.Files/Client/public/locales/en/ConvertDialog.json # products/ASC.Files/Client/public/locales/en/Home.json # products/ASC.Files/Client/public/locales/en/Translations.json # products/ASC.Files/Client/public/locales/en/UploadPanel.json # products/ASC.Files/Client/public/locales/es/ConvertDialog.json # products/ASC.Files/Client/public/locales/es/Home.json # products/ASC.Files/Client/public/locales/es/UploadPanel.json # products/ASC.Files/Client/public/locales/fi/Home.json # products/ASC.Files/Client/public/locales/fr/ConvertDialog.json # products/ASC.Files/Client/public/locales/fr/Home.json # products/ASC.Files/Client/public/locales/fr/Translations.json # products/ASC.Files/Client/public/locales/it/ConvertDialog.json # products/ASC.Files/Client/public/locales/it/Home.json # products/ASC.Files/Client/public/locales/it/Translations.json # products/ASC.Files/Client/public/locales/it/UploadPanel.json # products/ASC.Files/Client/public/locales/ja/Home.json # products/ASC.Files/Client/public/locales/ja/UploadPanel.json # products/ASC.Files/Client/public/locales/lv/Home.json # products/ASC.Files/Client/public/locales/nl/Home.json # products/ASC.Files/Client/public/locales/nl/Translations.json # products/ASC.Files/Client/public/locales/pl/Home.json # products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json # products/ASC.Files/Client/public/locales/pt-BR/Home.json # products/ASC.Files/Client/public/locales/pt-BR/Translations.json # products/ASC.Files/Client/public/locales/ro/Home.json # products/ASC.Files/Client/public/locales/ro/UploadPanel.json # products/ASC.Files/Client/public/locales/ru/ConvertDialog.json # products/ASC.Files/Client/public/locales/ru/Home.json # products/ASC.Files/Client/public/locales/ru/Translations.json # products/ASC.Files/Client/public/locales/ru/UploadPanel.json # products/ASC.Files/Client/public/locales/sk/Home.json # products/ASC.Files/Client/public/locales/tr/Home.json # products/ASC.Files/Client/public/locales/uk/Home.json # products/ASC.Files/Client/public/locales/vi/ConvertDialog.json # products/ASC.Files/Client/public/locales/vi/Home.json # products/ASC.Files/Client/public/locales/zh-CN/Home.json # products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json # products/ASC.Files/Client/src/HOCs/withBadges.js # products/ASC.Files/Client/src/HOCs/withContent.js # products/ASC.Files/Client/src/components/Badges.js # products/ASC.Files/Client/src/components/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Core/Utils/FileConverter.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs # products/ASC.Files/Service/Thumbnail/Worker.cs # products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js # public/locales/de/Common.json		2022-02-21 22:22:38 +03:00
..
Smtp	analizators/1481	2022-01-21 16:15:15 +03:00
AuthModel.cs	Auth: added session param	2021-11-26 21:59:39 +03:00
AuthServiceModel.cs	AuthService: added description	2020-09-03 11:43:13 +03:00
BuildVersion.cs	Api: fix document server version	2021-10-03 14:50:33 +03:00
CapabilitiesData.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
EncryptionSettingsModel.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EventWrapper.cs	Audit: resources. refactoring	2020-10-14 16:58:53 +03:00
FirebaseWrapper.cs	Moved getting firebase config to API method /api/2.0/settings.json	2021-07-09 18:28:08 +03:00
GreetingSettingsModel.cs	Web.Client/Server: Settings: added changing greetingTitle	2019-11-05 16:15:47 +03:00
IpRestrictionsModel.cs	fix	2020-10-14 12:11:04 +03:00
MailDomainSettingsModel.cs	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00
MailWhiteLabelSettingsModel.cs	x-www-form-urlencoded: add models	2020-11-10 13:41:32 +03:00
MobileAppModel.cs	Added · api/2.0/portal/mobile/registration	2020-11-01 14:58:43 +03:00
QuotaWrapper.cs	moved from 043e301	2021-11-16 20:40:15 +03:00
SchemaModel.cs	Api: removed SchemaItemModel	2021-04-13 20:10:14 +03:00
SecurityModel.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
SecurityWrapper.cs	Replaced NewtonsoftJson with System.Text.Json	2020-02-21 16:19:32 +03:00
SettingsModel.cs	Settings: Added SendOwnerChangeInstructions and ChangeOwner	2020-01-15 18:22:43 +03:00
SettingsWrapper.cs	Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage	2022-01-12 20:13:30 +03:00
ShortenLinkModel.cs	Fix getshortenlink	2021-03-21 18:29:35 +03:00
StatisticsWrapper.cs	Fix License	2020-07-08 18:30:23 +03:00
StorageEncryptionModel.cs	encryption: add api-metods getProgress and getSettings	2020-09-18 13:02:20 +03:00
StorageModel.cs	fix	2020-08-27 17:01:37 +03:00
StorageWrapper.cs	fix warnings	2020-10-12 16:52:31 +03:00
TenantVersionWrapper.cs	fix	2020-08-27 17:01:37 +03:00
TfaModel.cs	Tfa: added validation	2021-05-19 18:04:32 +03:00
TfaSettings.cs	Settings: added tfaapp method	2021-04-25 18:06:56 +03:00
ThirdpartyModel.cs	Api: ThirdPartyController	2020-11-11 12:11:44 +03:00
TimezonesModel.cs	Web.Api: SettingsController: added new model for timezones, changed api method	2019-10-30 14:33:27 +03:00
UploadLicenseModel.cs	Settings: added license/required and license upload	2020-08-03 16:42:59 +03:00
WebItemSecurityModel.cs	fix	2020-08-27 17:01:37 +03:00
WhiteLabelModel.cs	x-www-form-urlencoded: first version	2020-11-06 12:03:49 +03:00
WizardModel.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00