|
|
8252bce310
|
Fix Bug 54901 - Docs: Desktop. infinite loader on Linux
|
2022-04-06 20:26:20 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
|
ecb5c7fba2
|
Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link.
|
2022-02-17 15:12:54 +03:00 |
|
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
|
d0bb0c18a6
|
Web: Files: Fixed editing of converted file.
|
2022-02-02 19:32:38 +03:00 |
|
|
|
6750931fe9
|
Web: Files: Added error handler for request edit rights function.
|
2022-02-02 18:29:00 +03:00 |
|
|
|
76eead7708
|
Web: Files: Fixed editing of shared form.
|
2022-02-02 18:16:52 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
Timofey
|
95da73cda6
|
Web:Editor: app theme-support for loader background-color
|
2022-01-28 20:49:37 +08:00 |
|
|
|
5db134933b
|
Web: Files: Fixed error when clicked on "change access rights" twice.
|
2022-01-28 13:01:08 +03:00 |
|
Timofey
|
18ed20569d
|
Web:Editor: wrap editor in theme provider and delete theme as props in components
|
2022-01-27 21:54:58 +08:00 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
|
|
893c4ddc5a
|
Wen: Editor: Added a new parameter to the conversion api method.
|
2022-01-21 15:07:32 +03:00 |
|
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03:00 |
|
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
|
e09f079052
|
Web: Editor: Fixed checking key`s existing inside config
|
2021-12-15 15:40:37 +03:00 |
|
|
|
0244c3b924
|
Web: Editor: Restored config as param
|
2021-12-15 15:07:25 +03:00 |
|
|
|
055c200b60
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-12-10 16:31:29 +03:00 |
|
|
|
1d2750f23b
|
Web: Files: Remove privacy folders from select files/folders dialog.
|
2021-12-10 16:30:20 +03:00 |
|
|
|
ca7a0f7cb7
|
WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab.
|
2021-12-09 16:16:43 +03:00 |
|
|
|
3921fa74f3
|
Web: Editor: Deleted useless imports.
|
2021-12-08 17:00:24 +03:00 |
|
|
|
c41937002f
|
Web: Editor: Added a condition for showing the history restore function.
|
2021-12-08 16:52:50 +03:00 |
|
|
|
e771000f8a
|
Web: Editor: Deleted useless code.
|
2021-12-08 16:46:09 +03:00 |
|
|
|
3b17a90b1b
|
Web: Editor: Fixed after cherry picking.
|
2021-12-08 16:45:12 +03:00 |
|
|
|
51b7921ed4
|
Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
# packages/asc-web-common/api/files/index.js
|
2021-12-08 16:30:26 +03:00 |
|
|
|
d5a77379b3
|
Web: Editor: Added api method for restore document version.
|
2021-12-08 16:28:30 +03:00 |
|
|
|
aeb5121331
|
Web: Editor: Fixed displaying info.
|
2021-12-08 16:28:30 +03:00 |
|
|
|
3937082fc9
|
Web: Editor: Fixed object parameters of history data.
|
2021-12-08 16:28:30 +03:00 |
|
|
|
17129ad9d1
|
Erb: Editor: Renaming.
|
2021-12-08 16:28:30 +03:00 |
|
|
|
a3c4577482
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:29 +03:00 |
|
|
|
1983d60e55
|
Web: Editor: Moved the functionality of converting history and getting the current version into separate functions.
|
2021-12-08 16:28:29 +03:00 |
|
|
|
944591cd4d
|
Web: Editor: Added error handler for history function.
|
2021-12-08 16:28:29 +03:00 |
|
|
|
71aa1eb474
|
Web: Editor: Added restore option.
|
2021-12-08 16:28:29 +03:00 |
|
|
|
30bd96a4c6
|
Web: Editor: Fixed opening of revisions.
|
2021-12-08 16:28:28 +03:00 |
|
|
|
bc8a7f3dd2
|
Web: Editor: Removed revisions from versions list.
|
2021-12-08 16:28:28 +03:00 |
|
|
|
70cc67b356
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:28 +03:00 |
|
|
|
d20f833889
|
Web: Editor: Renaming.
|
2021-12-08 16:28:28 +03:00 |
|
|
|
d5b2b2a395
|
Web: Editor: Added error handler for history data.
|
2021-12-08 16:28:28 +03:00 |
|
|
|
a79db0fa25
|
Web: Editor: Added version to the history data.
|
2021-12-08 16:28:27 +03:00 |
|
|
|
fcb4e43d55
|
Web: Editor: Removed side effect - changes of array length.
|
2021-12-08 16:28:27 +03:00 |
|
|
|
a6deb7febb
|
Web: Editor: Fixed display of editing date.
|
2021-12-08 16:28:27 +03:00 |
|
|
|
7fd1452e81
|
Web: Editor: Fixed current version of document.
|
2021-12-08 16:28:27 +03:00 |
|
|
|
c6265a9cb4
|
Web: Editor: Fixed getting name and id of user for history.
|
2021-12-08 16:28:26 +03:00 |
|
|
|
5fa436eb21
|
Web: Editor: Fixed getting information of difference of file.
|
2021-12-08 16:28:26 +03:00 |
|
|
|
e3eb043c2a
|
Web: Editor: Added new api method for RequestHistory method.
|
2021-12-08 16:28:26 +03:00 |
|
|
|
475dd92c30
|
Web: Editor: Fixed history information.
|
2021-12-08 09:37:40 +03:00 |
|
|
|
6d96855e79
|
Web: Editor: Added list of history and possibility to close history.
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-12-08 09:37:02 +03:00 |
|
|
|
086cc8efd2
|
Web: Fixed format of searchParam for files selector
|
2021-12-03 18:41:57 +03:00 |
|
