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
..
Calendars	analizators/s3442	2022-01-24 12:57:01 +03:00
Extensions	Analizators/U2U1104	2022-01-14 16:12:37 +03:00
Files	fixed warnings	2022-02-07 20:19:58 +03:00
Helpers	analizators/s2259	2022-01-21 16:46:30 +03:00
Jabber
Mail	DbContext: optimization	2021-07-15 13:07:47 +03:00
Mobile	analizators/ca1507	2022-01-24 13:49:00 +03:00
ModuleManagement
Notify	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
PublicResources	fix Bug 52493 - Welcome page. notify «User with this email is already registered»	2021-11-30 12:09:51 +03:00
Security
Sms	Analyzers: fix	2022-02-07 17:53:58 +03:00
Statistic	DbContext: optimization	2021-07-15 13:07:47 +03:00
Subscriptions	analizators/s1104	2022-01-21 12:19:57 +03:00
Tfa	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Users	Merge branch 'develop' into feature/analizators	2022-02-07 19:28:23 +03:00
Utility	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
WebZones
WhiteLabel	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
AddonContext.cs
ASC.Web.Core.csproj	Packages updated	2022-02-02 19:54:23 +03:00
AuthService.cs
CollaboratorSettings.cs
CommonPhotoManager.cs	analizators/s2259	2022-01-21 16:46:30 +03:00
CookiesManager.cs	Core: fixed session	2021-11-30 22:16:23 +03:00
CustomNavigationSettings.cs
EmailActivationSettings.cs
FileSizeComment.cs	Analizators/U2U1104	2022-01-14 16:12:37 +03:00
IAddon.cs
IModule.cs
IProduct.cs
IWebItem.cs
LoginProfileExtension.cs
LogoUploader.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
ModuleContext.cs
NavigationWebItem.cs
PersonalSettings.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
PrivacyRoomSettings.cs	analizators/U2U1115	2022-01-17 11:22:52 +03:00
Product.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
ProductContext.cs
PromotionsSettings.cs
QuotaSync.cs	fixed warnings	2022-02-07 20:19:58 +03:00
Recaptcha.cs	Analizators/U2U1104	2022-01-14 16:12:37 +03:00
SecutiryConstants.cs	analizators/s1118	2022-01-21 13:47:56 +03:00
SetupInfo.cs	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
SpaceUsageStatManager.cs
StudioAdminMessageSettings.cs
StudioDefaultPageSettings.cs
StudioTrustedDomainSettings.cs
TariffSettings.cs
TipsSettings.cs
WebItemContext.cs
WebItemManager.cs	Analyzers: fix	2022-02-07 17:53:58 +03:00
WebItemSecurity.cs	analizators/ca1507	2022-01-24 13:49:00 +03:00
WebItemSecurityInfo.cs