Artem Tarasov
|
3d78fd6576
|
Web: Doceditor/Files: deleted unnecessary code
|
2022-04-04 16:41:55 +03:00 |
|
Artem Tarasov
|
1195dc74ca
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
|
2022-03-29 17:53:01 +03:00 |
|
Artem Tarasov
|
4bcd966ab3
|
Web: Files: fixed render props
|
2022-03-27 00:04:05 +03:00 |
|
|
ee8b6eafc1
|
Web: Files: deleted useless folders after merge.
|
2022-03-22 13:22:51 +03:00 |
|
|
251f149eb6
|
Web: Revert withoutBodyScroll after merge.
|
2022-03-22 13:19:35 +03:00 |
|
|
a72106dfae
|
Web: Files: Deleted useless file after merge.
|
2022-03-21 11:55:38 +03:00 |
|
|
209d7bd750
|
Web: Files: Deleted unused code.
|
2022-03-15 12:29:09 +03:00 |
|
|
dc273d4a21
|
Web: Files: Changed translations keys.
|
2022-03-10 17:52:26 +03:00 |
|
|
d793b099ff
|
WEb: Files: Changed translation keys.
|
2022-03-10 17:45:13 +03:00 |
|
|
64dfd61858
|
Merge branch 'develop' into feature/backup
|
2022-03-10 12:15:26 +03:00 |
|
|
1a9ced4901
|
Web: Files: fixed context menu opening
|
2022-03-05 17:36:04 +03:00 |
|
|
74345b1c3c
|
Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports
|
2022-03-03 12:37:54 +03:00 |
|
|
ba2fc9fe88
|
Merge branch 'develop' into refactoring/refactoring-context-menu
|
2022-03-03 12:33:42 +03:00 |
|
|
54cecbd5b3
|
Web: Files: fixed ContextOptionsStore errors
|
2022-03-03 12:29:48 +03:00 |
|
|
2cc05247db
|
Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function
|
2022-03-02 15:15:03 +03:00 |
|
|
f57cff1dcc
|
Merge branch 'develop' into feature/backup
|
2022-03-02 11:21:57 +03:00 |
|
|
e5ba722f7c
|
Web: Files: fixed withBadges, withContent HOCs re-render
|
2022-02-28 15:46:06 +03:00 |
|
|
2092430bcf
|
Web: Files: fixed getting filesList
|
2022-02-28 11:03:42 +03:00 |
|
|
cae358636e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 17:51:06 +03:00 |
|
|
04737a6c6d
|
Web: Client: Files: Added fixedDirection property for AccessComboBox
|
2022-02-25 17:45:20 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
63d10f291f
|
Web: Files: RowView: Fixed editing input style for screens less than small tablet
|
2022-02-25 12:18:27 +03:00 |
|
|
6c0f8c18e1
|
Web: Files: EditingWrapperComponent: Fixed padding for table view
|
2022-02-25 12:16:12 +03:00 |
|
|
e319a5e31f
|
Web: Files: EditingWrapperComponent: Fixed padding for cancel button
|
2022-02-25 11:07:08 +03:00 |
|
|
8da91b7f8f
|
Web: Files: VersionHistory fixed Ipad styles
|
2022-02-24 19:29:01 +03:00 |
|
|
159dfe0028
|
Web: Files: fixed VersionHistory page styles
|
2022-02-24 19:13:40 +03:00 |
|
|
4be97f77e7
|
Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view
|
2022-02-24 18:55:09 +03:00 |
|
|
9f5bae12ad
|
Web: Files: fixed EditingWrapperComponent styles
|
2022-02-24 18:54:55 +03:00 |
|
|
7377507481
|
Web: Files: RowView: Fixed right margin for last badge item
|
2022-02-24 18:03:27 +03:00 |
|
|
7bc4e141fa
|
Web: Files: RowView: Fixed displaying for quick buttons for small tablet width
|
2022-02-24 17:43:37 +03:00 |
|
|
7995f38ef9
|
Web: Files: Badges/QuickButtons: Restored show logic after merge
|
2022-02-24 16:36:06 +03:00 |
|
|
fab67e575c
|
Web: Files: fixed files loader styles
|
2022-02-24 11:44:40 +03:00 |
|
|
34f6570027
|
Web: Files: fixed files loader
|
2022-02-24 11:42:33 +03:00 |
|
|
d7f16aa96d
|
Web: Table: fixed table styles
|
2022-02-24 11:20:32 +03:00 |
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03:00 |
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +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 |
|
|
e848d5d979
|
Web: Files: Table/Filter: Restored sorting inside favorite folder
|
2022-02-17 12:45:55 +03:00 |
|
|
638390de68
|
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
|
2022-02-16 15:14:10 +03:00 |
|
|
924d9bda34
|
Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder
|
2022-02-16 13:58:57 +03:00 |
|
|
ee40f9ba7f
|
Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder
|
2022-02-16 13:55:42 +03:00 |
|
|
62b4b55dca
|
Web: Files: moved isEdit, titleWithoutExt to inject
|
2022-02-16 13:18:14 +03:00 |
|
|
5322ed2cec
|
Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming.
|
2022-02-16 12:03:22 +03:00 |
|
|
5e12bf583c
|
Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’
|
2022-02-15 18:39:14 +03:00 |
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
|
ead3820e66
|
Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats
|
2022-02-15 16:33:00 +03:00 |
|
|
51a9e48a1b
|
Web: Files: fixed encryptionUploadDialog
|
2022-02-15 16:32:21 +03:00 |
|
|
1aa99f3802
|
Web: Files: removed TODO
|
2022-02-15 16:31:57 +03:00 |
|
|
b04b6d897d
|
Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats
|
2022-02-15 16:13:52 +03:00 |
|
|
ccc0838269
|
Web: Files: removed FormatsStore, added getting file formats from SettingsStore
|
2022-02-15 15:58:31 +03:00 |
|