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
..
icons	Web: Files: changed folder icons, added new icons	2021-10-18 12:24:01 +03:00
services	Web: Client: Files: Added "en" Yandex disk icon	2021-09-30 17:52:43 +03:00
actions.documents.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
actions.presentation.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
actions.upload.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
button.cancel.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
catalog.folder.react.svg	Web: Files: fixed icons imports, fixed components imports, fixed files module	2021-02-25 17:20:06 +03:00
catalog.question.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
check.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
clear.active.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
convert_alert.png	Web: Files: added convert dialog	2020-07-07 10:26:28 +03:00
cross.svg	Web: Files: Added images by layout	2020-10-12 16:15:35 +03:00
dark_general.png	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
download-as.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
download.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
empty_screen_corporate.png	Web: Files: added empty screen containers to root folders and filter	2020-04-14 13:33:52 +03:00
empty_screen_favorites.png	Add Favorites empty screen picture	2020-09-29 13:34:59 +03:00
empty_screen_filter.png	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
empty_screen_forme.png	Web: Files: added empty screen containers to root folders and filter	2020-04-14 13:33:52 +03:00
empty_screen_people.svg	Web: Added styles and changed images by layout	2020-10-16 16:21:33 +03:00
empty_screen_privacy.png	Add private room empty screen container	2020-10-23 15:31:10 +03:00
empty_screen_recent.png	Add Recent to the tree node.	2020-10-07 14:26:08 +03:00
empty_screen_trash.png	Web: Files: added empty screen containers to root folders and filter	2020-04-14 13:33:52 +03:00
example-thumbnail.png	Web: Files: fixed tile styles	2020-07-10 10:35:36 +03:00
external.link.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
favorites.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
file.actions.convert.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
file.actions.edit.form.react.svg	Web: Files: Fixed editing form badge. Fixed icon.	2021-12-02 15:32:30 +03:00
files.menu.svg	Web: updated icons of modules	2022-01-12 15:51:36 +03:00
files.svg	Web: Fixed modules icons	2021-01-25 14:28:51 +03:00
form.file.react.svg	Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons.	2021-11-16 16:40:27 +03:00
form.react.svg	Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons.	2021-11-16 16:40:27 +03:00
header.plus.svg	Web: Icons: Fixed old checkbox icons, change header plus icon	2021-10-14 13:09:54 +03:00
history-finalized.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
history.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_box.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_dropbox.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_google_drive.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_kdrive.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_nextcloud.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_onedrive.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_owncloud.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_sharepoint.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_webdav.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
icon_yandex_disk.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
key.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
load.error.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
lock.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
move.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
plus.svg	Web: Files: Added images by layout	2020-10-12 16:15:35 +03:00
privacy.svg	Add private room empty screen container	2020-10-23 15:31:10 +03:00
rectangle.filter.react.svg	Web: Files: fixed icons imports, fixed components imports, fixed files module	2021-02-25 17:20:06 +03:00
remove.svg	Web: Files: Store: Added mark read action, added remove from list and mark read icons	2021-05-19 13:54:45 +03:00
rename.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
security.svg	Add security icon	2020-12-08 13:54:30 +03:00
sort-arrow.react.svg	Web: Components: Table: added settings, fixed table group menu header	2021-07-19 14:09:09 +03:00
spreadsheet.react.svg	Web: Transferring icons from a shared folder to modules. Icons are displayed by url.	2021-02-20 11:46:32 +03:00
tick.rounded.svg	Web: Files: Store: Added mark read action, added remove from list and mark read icons	2021-05-19 13:54:45 +03:00
up.svg	Web: Files: Added images by layout	2020-10-12 16:15:35 +03:00
vertical-dots.react.svg	Web: Files: fixed icons imports, fixed components imports, fixed files module	2021-02-25 17:20:06 +03:00
z-a.sorting.react.svg	Web: Files: fixed icons imports, fixed components imports, fixed files module	2021-02-25 17:20:06 +03:00