|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +03:00 |
|
|
|
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 |
|
|
|
43ad5c1747
|
Web: Common: add children props for ErrorContainer
|
2022-02-21 18:42:57 +03:00 |
|
|
|
ebd51f3f6b
|
Web: Components: DropDown: Disable linter warnings
|
2022-02-17 14:38:07 +03:00 |
|
|
|
c8790b2cc6
|
Web: Components: ComboBox: Added manualWidth property for DropDown component
|
2022-02-17 14:37:32 +03:00 |
|
|
|
c2c802b732
|
Web: Common: PageLayout: Fixed default PageLayout header styles after merge
|
2022-02-17 13:06:42 +03:00 |
|
|
|
7419eb87dc
|
Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips)
|
2022-02-16 21:34:19 +03:00 |
|
|
|
d634d82050
|
Web: Components: Added enableToggle for <ToggleContent />
|
2022-02-16 21:30:52 +03:00 |
|
|
|
15830a9fe0
|
Fix bug 53339: open banner link in new tab
|
2022-02-16 18:03:21 +03:00 |
|
|
|
80f97ef50d
|
Web: Components: ContextMenu: Added left padding for arrow icon
|
2022-02-16 15:22:46 +03:00 |
|
|
|
e6731ec23d
|
Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions
|
2022-02-16 13:57:59 +03:00 |
|
|
|
02a9c6f973
|
Web: Common: FilterInput: Fixed displaying sort icon if sort items hidden
|
2022-02-16 13:54:11 +03:00 |
|
|
|
5a876ff5ab
|
Web: Common: FilterInput: Added property for hiding sort items inside SortComboBox
|
2022-02-16 13:53:09 +03:00 |
|
|
|
5e12bf583c
|
Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’
|
2022-02-15 18:39:14 +03:00 |
|
|
|
264b3a8764
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 14:10:44 +03:00 |
|
|
|
ce048a9646
|
Web: Components: fix avatar resize
|
2022-02-15 14:10:28 +03:00 |
|
|
|
2f5feb4041
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 14:03:41 +03:00 |
|
|
|
c710545bdd
|
Fixed Bug 55331 - Added default cursor for modal dialog.
|
2022-02-15 14:02:52 +03:00 |
|
|
|
b9f6ec6615
|
Web: Components: fix banner loader
|
2022-02-15 11:58:12 +03:00 |
|
|
|
0850e20d63
|
Web: Common: move firebase config from hotfix/campaigns banner
|
2022-02-15 11:34:15 +03:00 |
|
|
|
0ef8f00fb3
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 10:14:19 +03:00 |
|
|
|
cfa53b3450
|
Web:Common:Fix display images in media viewer.
|
2022-02-15 10:13:35 +03:00 |
|
|
|
01f8f95556
|
Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window.
|
2022-02-14 15:54:38 +03:00 |
|
|
|
fecb7d5e37
|
Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.
|
2022-02-10 19:49:44 +03:00 |
|
|
|
16562b1787
|
Web: Common: get user data from confirm
|
2022-02-09 14:51:01 +03:00 |
|
|
|
ba9cbf811b
|
Web: SW: Fix unregister on undefined
|
2022-02-09 12:33:09 +03:00 |
|
|
|
78fb372dcd
|
Web: e2e-tests: Fix create user test
|
2022-02-08 18:05:45 +03:00 |
|
|
|
162edd36f8
|
Web: Components: fix style
|
2022-02-07 08:00:20 +03:00 |
|
|
|
27ecf41480
|
Web: Components: fix warning
|
2022-02-07 07:57:49 +03:00 |
|
|
|
b03a466591
|
Web: Common: add set roomsMode
|
2022-02-06 22:55:15 +03:00 |
|
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
|
|
81d8d8fc09
|
Web: Components: fix handle
|
2022-02-03 16:10:03 +03:00 |
|
|
|
ef5a3ad954
|
Web: Components: add handleChange for code input
|
2022-02-03 16:06:36 +03:00 |
|
|
|
f36cd35e91
|
Web: Components: fix allowed characters
|
2022-02-03 14:57:42 +03:00 |
|
|
|
655ae73a65
|
Web: Files: Fix refresh last page on delete all items (+ socket refactoring)
|
2022-02-03 14:57:23 +03:00 |
|
|
|
c40a4d136c
|
Web: Components: fix warning
|
2022-02-03 14:27:05 +03:00 |
|
|
|
a9ebe0090b
|
Web: Components: fix code input style
|
2022-02-03 14:23:20 +03:00 |
|
|
|
6e6d06d9d7
|
Web: Components: fix code input style
|
2022-02-03 14:08:45 +03:00 |
|
|
|
a345b562d3
|
Web: Components: fix code-input style and logic
|
2022-02-03 12:49:27 +03:00 |
|
|
|
2017efbe07
|
Web: Components: add code-input test
|
2022-02-03 01:48:33 +03:00 |
|
|
|
867d3f4ec7
|
Web: Common: add roomsMode flag
|
2022-02-03 01:38:35 +03:00 |
|
|
|
646473f4f7
|
Web: Common: get sso translate
|
2022-02-03 01:10:12 +03:00 |
|
|
|
d21bd70cca
|
Web: Components: add readme for code-input
|
2022-02-03 01:04:23 +03:00 |
|
|
|
717bc63cf7
|
Web: Components: add code-input
|
2022-02-03 00:57:47 +03:00 |
|
Artem Tarasov
|
6562e36a13
|
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
|
2022-02-02 14:55:38 +03:00 |
|
|
|
bf07a141d8
|
Web:Common:Fix.
|
2022-02-02 14:22:41 +03:00 |
|
|
|
c8f1fc9f03
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-01 16:53:56 +03:00 |
|
|
|
a11d24db47
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-01-31 13:09:11 +03:00 |
|
