Commit Graph

48286 Commits

Author SHA1 Message Date
25d2c7bb2b Web: Components: fixed translations for room access options 2024-07-29 17:45:33 +03:00
Akmal Isomadinov
46a1e1455b Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-07-29 19:42:25 +05:00
Akmal Isomadinov
d381fd166c Client:InvitePanel Fixed role descriptions for the form room 2024-07-29 19:42:15 +05:00
2d4fe09f21 Web: Components: Selector: fixed body height 2024-07-29 17:31:57 +03:00
Akmal Isomadinov
92bac99ed7 Doceditor:CompletedForm Fixed form number 2024-07-29 18:57:46 +05:00
Akmal Isomadinov
06f0a1d754 Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-07-29 18:30:33 +05:00
31323d26ba Merge branch 'refs/heads/develop' into feature/rtl-refactor
# Conflicts:
#	packages/client/src/components/ItemIcon.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js
#	packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
#	packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
#	packages/client/src/components/panels/UploadPanel/FileRow.js
#	packages/client/src/pages/FormGallery/Filter/SortFilter/index.styled.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
#	packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js
#	packages/shared/components/media-viewer/MediaViewer.styled.ts
2024-07-29 15:28:49 +02:00
Akmal Isomadinov
792ab3cc40 Doceditor:CompletedForm Fixed scroll and styles 2024-07-29 18:28:14 +05:00
4615b68dc1 Merge branch 'develop' into feature/public-edit 2024-07-29 16:57:28 +04:00
671842b5b7
Merge pull request #555 from ONLYOFFICE/feature/convert-xml-dialog
feature/convert-xml-dialog
2024-07-29 16:51:07 +04:00
d194cfeaa6 Merge branch 'develop' into feature/convert-xml-dialog 2024-07-29 16:25:06 +04:00
072ce77b8a Merge branch 'develop' into feature/public-edit 2024-07-29 16:22:00 +04:00
602ce53411 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
2024-07-29 16:13:17 +04:00
2a958b3c7c Login:Src:Confirm: change import ConfirmRoute 2024-07-29 15:54:21 +04:00
b0743e86a0 login:Src:Components: change imports 2024-07-29 15:53:31 +04:00
440d9c39bd Login:Src:HOCs: move withLoader 2024-07-29 15:45:45 +04:00
90acc56b4e Login:Src:Components: move ConfirmRoute 2024-07-29 15:44:57 +04:00
cd4e0b763c Login:Confirm:TfaActivation: remove console log 2024-07-29 14:03:12 +04:00
e718fd5f4c Login:Components:TfaActivationForm: add some changes 2024-07-29 14:02:07 +04:00
7e7988b66e Login:Confirm:TfaAuth: add page for TfaAuth 2024-07-29 14:00:23 +04:00
c78633d719 Login:Components:TfaAuthForm: add TfaAuthForm 2024-07-29 13:59:10 +04:00
308ebd2d8d Merge branch 'hotfix/v2.6.1' into bugfix/Bug69117 2024-07-29 11:57:51 +03:00
a0053de0aa Merge branch 'release/v2.6.0' into hotfix/v2.6.1 2024-07-29 12:30:04 +04:00
3daea85546 Client:Profile:Section:Body:LoginSettings: change location.state to sessionStorage 2024-07-29 12:24:36 +04:00
0a6e722f64 Clients:Components:ResetApplicationDialog: change navigate to window.location 2024-07-29 12:22:21 +04:00
d00351fb39 Login:Confirm:TfaActivation: add page for TfaActivation 2024-07-29 12:18:34 +04:00
b1bd16564e Login:App:Confirm: remove isLoadedState from withLoader 2024-07-29 12:16:07 +04:00
e6741fcab9 Login:Components:ChangeOwnerForm: add use client and change imports 2024-07-29 12:13:10 +04:00
8e7bbdc8ad Login:Components:TfaActivationForm: add TfaActivationForm 2024-07-29 12:10:15 +04:00
dd38adfb33 Login:Src:Types: add TTfaSecretKeyAndQR type 2024-07-29 12:05:15 +04:00
43631a0f64 Login:Src:Utils: add TFA constants and getTfaSecretKeyAndQR action 2024-07-29 12:03:45 +04:00
b85b33bcc1 Shared:Api:Settings: change confirmKey type for validateTfaCode function 2024-07-29 12:00:58 +04:00
b13cd56eeb Fix bug 68281 - Accounts. Correct role description for administrators 2024-07-26 17:40:03 +03:00
32d12d32f0
Merge pull request #562 from ONLYOFFICE/bugfix/gallery-form
Bugfix/gallery form
2024-07-26 16:44:36 +04:00
Akmal Isomadinov
9b0bef0aa4 Client: Fixed URL 2024-07-26 17:41:11 +05:00
Akmal Isomadinov
1b7a7b28a1 Client: Fixed Bug 69424
When creating a PDF form from the gallery, it opens in edit mode
2024-07-26 17:39:38 +05:00
3f50e0bc7c Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-07-26 15:13:45 +03:00
50bb01cdd1 Fix Bug 69422 - Rooms.ChangeOwner. Fixed leaving the room 2024-07-26 15:13:40 +03:00
a5640c4628 Add translations for multiple languages 2024-07-26 15:04:24 +03:00
0685910347 Merge branch 'release/v2.6.0' into hotfix/v2.6.1 2024-07-26 15:31:25 +04:00
c7022f8ae1
Merge pull request #561 from ONLYOFFICE/bugfix/form-modal-window
Fixed modal form
2024-07-26 15:21:02 +04:00
Akmal Isomadinov
99cd55ff9e Client:useStartFillingSelectDialog Fix 2024-07-26 16:05:05 +05:00
da2f32938a Web: Components: Selector: fixed styles 2024-07-26 14:02:26 +03:00
Akmal Isomadinov
fbbf03f366 Fixed modal form 2024-07-26 15:57:28 +05:00
bd48050ab8 Merge branch 'release/v2.6.0' into hotfix/v2.6.1 2024-07-26 14:20:10 +04:00
6ce5cc24ca
Merge pull request #559 from ONLYOFFICE/bugfix/info-panel-history
Web: Client: InfoPanel: History. fix crash
2024-07-26 13:56:02 +04:00
52f7992393 Web: Client: InfoPanel: History. fix crash 2024-07-26 14:43:46 +05:00
3f0af41170 Fix Bug 69417 - WordPress. Seamless DocSpace authorization does not work in a frame 2024-07-26 13:27:35 +04:00
3e8c79c287 Merge remote-tracking branch 'origin/hotfix/v2.6.1' into bugfix/Bug69117 2024-07-26 11:27:16 +03:00
06fe719199 InfoPanel: History: refactoring 2024-07-26 11:50:15 +04:00