|
|
a867a3b367
|
Merge branch 'feature/scrolling-skeleton' of https://github.com/ONLYOFFICE/DocSpace-client into feature/scrolling-skeleton
|
2024-08-06 17:34:01 +03:00 |
|
|
|
aaf58e6647
|
Web: Components: InfiniteLoader: fixed StyledItem styles
|
2024-08-06 17:33:52 +03:00 |
|
Akmal Isomadinov
|
15797bbf6c
|
Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-08-06 19:11:31 +05:00 |
|
Akmal Isomadinov
|
0df04bfda6
|
Shared:MediaViewer: Fixed Load original image if thumbnail is unavailable
|
2024-08-06 19:11:14 +05:00 |
|
|
|
0ac4c84905
|
Merge branch 'hotfix/v2.6.1' into feature/scrolling-skeleton
|
2024-08-06 18:10:41 +04:00 |
|
|
|
b95e388d9d
|
Merge pull request #573 from ONLYOFFICE/bugfix/66037
Bugfix/66037
|
2024-08-06 18:09:02 +04:00 |
|
|
|
b90902f461
|
Web: Components: LinkRow: fixed Combobox
|
2024-08-06 16:48:19 +03:00 |
|
|
|
0ddcfd8b62
|
Web: Components: InfiniteLoader: added skeleton when quickly scrolling the list, added skeleton for room tiles
|
2024-08-06 14:34:33 +03:00 |
|
|
|
04cf1999d7
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-06 13:59:26 +03:00 |
|
|
|
b549c262a7
|
Deleted useless code.
|
2024-08-06 13:47:54 +03:00 |
|
|
|
544489b2b3
|
Deleted useless code.
|
2024-08-06 13:46:47 +03:00 |
|
|
|
78e8958d03
|
Merge branch 'hotfix/v2.6.1' into bugfix/66037
|
2024-08-06 14:24:53 +04:00 |
|
|
|
dc27284371
|
Deleted useless code.
|
2024-08-06 13:14:54 +03:00 |
|
Akmal Isomadinov
|
3fdd6cfc5a
|
Shared:MediaViewer Added handling for image loading interruptions
|
2024-08-06 14:50:52 +05:00 |
|
|
|
c49d5a58d3
|
Merge branch 'hotfix/v2.6.1' into bugfix/66037
|
2024-08-06 11:34:34 +04:00 |
|
|
|
54f0bffc7b
|
Refactoring.
|
2024-08-06 10:17:07 +03:00 |
|
|
|
50f593032b
|
Deleted useless request.
|
2024-08-06 10:12:27 +03:00 |
|
|
|
4bc417422e
|
Merge branch 'hotfix/v2.6.1' into feature/api-separation
# Conflicts:
# packages/shared/store/AuthStore.ts
|
2024-08-06 09:28:05 +03:00 |
|
Vlada Gazizova
|
2de66aab89
|
Merge branch 'develop' into feature/move-quick-buttons
|
2024-08-05 19:00:29 +03:00 |
|
|
|
6601566913
|
Shared: Api: People: Added loginEventId to user type
|
2024-08-05 17:58:59 +03:00 |
|
Vlada Gazizova
|
902feb3654
|
Shared:IconButton:Fixed flickering of quick buttons with color when adding/hiding a column.
|
2024-08-05 17:55:23 +03:00 |
|
Vlada Gazizova
|
393fb016b3
|
Shared:Table:Fix jump context menu in row after adding/hiding a column after removing a column with quick buttons.
|
2024-08-05 17:53:41 +03:00 |
|
|
|
45d5df5073
|
Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-08-05 16:10:27 +03:00 |
|
|
|
1f36216278
|
Shared:Selectors:Files: add timer to showing list loader
|
2024-08-05 15:58:57 +03:00 |
|
|
|
c4f611289e
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-08-05 16:33:11 +04:00 |
|
|
|
eb00f325e6
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-08-05 16:24:26 +04:00 |
|
|
|
da870c43f1
|
Shared: AccessRightSelect: fix css is undefined
|
2024-08-05 16:19:57 +04:00 |
|
|
|
5c9a26987c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/api/rooms/index.ts
|
2024-08-05 15:37:22 +04:00 |
|
|
|
f47a65777b
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-05 15:35:03 +04:00 |
|
|
|
c708b6cda3
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-05 14:01:25 +03:00 |
|
|
|
888cbebce4
|
Shared:Selectors: fix types
|
2024-08-05 14:00:08 +03:00 |
|
|
|
ac1b85aef3
|
Confirm: OAuth user creation fix (add header)
|
2024-08-05 13:24:25 +04:00 |
|
|
|
547301e286
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-08-05 12:23:06 +03:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
|
9aee15612f
|
Shared: fix missing
|
2024-08-02 11:16:16 +03:00 |
|
|
|
408b5f0269
|
Shared: Themes: fix rombs color
|
2024-08-02 11:11:31 +03:00 |
|
|
|
071dbcfb60
|
Shared: fix missing
|
2024-08-02 11:06:55 +03:00 |
|
|
|
13fa0a6807
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-02 01:51:37 +04:00 |
|
|
|
21b585fc7e
|
Web: Shared: LinkRow: reworked link regeneration to link deletion
|
2024-08-01 17:28:02 +03:00 |
|
|
|
e7d651811c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/components/access-right-select/AccessRightSelect.styled.ts
|
2024-08-01 16:34:06 +03:00 |
|
Vlada Gazizova
|
f62d9ee64d
|
Shared:Changing the function to display the last column and the Name column too.
|
2024-08-01 14:51:01 +03:00 |
|
Vlada Gazizova
|
b93441d1f2
|
Client:Hiding badges__quickButtons.
|
2024-08-01 14:50:00 +03:00 |
|
|
|
a1d4ad5e34
|
Shared: Components: TopLoadingIndicator: Added cancel method for cancellation current loading process
|
2024-08-01 14:05:51 +03:00 |
|
|
|
a453b1e8b4
|
Shared: Utils: Common: Added showProgress for operations progress
|
2024-08-01 14:04:34 +03:00 |
|
|
|
05e6532851
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-31 22:36:13 +03:00 |
|
|
|
948add3bf4
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-07-30 20:33:27 +04:00 |
|
|
|
ab2f184dad
|
Merge branch 'hotfix/v2.6.1' into bugfix/save-table-sorting
|
2024-07-30 20:09:02 +04:00 |
|
|
|
8b166810ed
|
Merge branch 'hotfix/v2.6.1' into bugfix/Bug69117
|
2024-07-30 19:55:54 +04:00 |
|
|
|
a37d7ccb98
|
Bump version to v2.6.1
|
2024-07-30 19:53:48 +04:00 |
|
|
|
941ee2dce0
|
Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-07-30 14:03:30 +03:00 |
|
|
|
d817280f88
|
Shared: Api: Portal: Fixed getInvitationLink method
|
2024-07-30 14:00:38 +03:00 |
|
|
|
6a26128ee3
|
Shared: Themes: fix after merge
|
2024-07-30 13:03:38 +03:00 |
|
|
|
447003315c
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-30 13:00:40 +03:00 |
|
Vlada Gazizova
|
4f12114124
|
Shared: Fix filter const sortBy and sortOrder as url.
|
2024-07-30 11:16:37 +03:00 |
|
Akmal Isomadinov
|
181f311781
|
Web: Removed useless code
|
2024-07-30 13:15:05 +05:00 |
|
|
|
12355b9192
|
Merge branch 'hotfix/v2.6.1' into bugfix/Bug69117
|
2024-07-30 10:34:55 +03:00 |
|
|
|
d0d03ccd33
|
Shared: Table: fix
|
2024-07-30 10:33:59 +03:00 |
|
|
|
e155ca9059
|
Client: Shared: remove useless code
|
2024-07-29 17:04:16 +02:00 |
|
|
|
25d2c7bb2b
|
Web: Components: fixed translations for room access options
|
2024-07-29 17:45:33 +03:00 |
|
|
|
2d4fe09f21
|
Web: Components: Selector: fixed body height
|
2024-07-29 17:31:57 +03: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 |
|
|
|
4615b68dc1
|
Merge branch 'develop' into feature/public-edit
|
2024-07-29 16:57:28 +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 |
|
|
|
308ebd2d8d
|
Merge branch 'hotfix/v2.6.1' into bugfix/Bug69117
|
2024-07-29 11:57:51 +03:00 |
|
|
|
b85b33bcc1
|
Shared:Api:Settings: change confirmKey type for validateTfaCode function
|
2024-07-29 12:00:58 +04:00 |
|
|
|
0685910347
|
Merge branch 'release/v2.6.0' into hotfix/v2.6.1
|
2024-07-26 15:31:25 +04: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 |
|
|
|
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 |
|
|
|
38af49f027
|
Web: Components: Table: fixed imports
|
2024-07-25 17:11:35 +03:00 |
|
|
|
084261a4da
|
Merge branch 'release/v2.6.0' into bugfix/Bug69117
|
2024-07-25 17:04:57 +03:00 |
|
|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +03:00 |
|
|
|
ca48bb350f
|
Web: Components: Table.utils: fixed checkingForUnfixedSize
|
2024-07-24 19:05:57 +03:00 |
|
|
|
8e0fbd8470
|
Shared:Components:ColorTheme: change types for LinkColorTheme
|
2024-07-24 17:54:11 +04:00 |
|
|
|
7a64964df2
|
Shared: Themes: add colors
|
2024-07-24 16:32:00 +03:00 |
|
|
|
14086fc550
|
Shared: fix after merge
|
2024-07-24 15:31:21 +03:00 |
|
|
|
28c03fdb6b
|
Shared: Themes: fix after merge
|
2024-07-24 15:26:11 +03:00 |
|
|
|
165f57ea88
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-24 15:04:46 +03:00 |
|
|
|
96c354842f
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-24 11:17:23 +05:00 |
|
|
|
b8a61b2823
|
Web: Client: UploadPanel. fix styles
|
2024-07-24 11:17:17 +05:00 |
|
|
|
4d059d3067
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-23 19:21:28 +03:00 |
|
|
|
7f85e8008e
|
Web: Components: TableHeader: fix
|
2024-07-23 19:21:23 +03:00 |
|
|
|
2650d17533
|
Merge branch 'release/v2.6.0' into bugfix/group-dialog-issues
|
2024-07-23 19:07:06 +04:00 |
|
|
|
f3a9766994
|
Web: Components: TableHeader: restored check
|
2024-07-23 17:29:48 +03:00 |
|
|
|
55840596be
|
Shared:Utils: bug fix TypeError: fetch failed
|
2024-07-23 15:32:16 +04:00 |
|
|
|
46063047c9
|
Client: EditGroupMembersDialog: Add infinite scroll and search from server
|
2024-07-23 12:49:08 +02:00 |
|
|
|
78d64b05cf
|
Fix Bug 69217 - Files. Info. History. The folder from which the file was copied is incorrectly indicated in the history
|
2024-07-23 13:48:55 +05:00 |
|
|
|
116702d286
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
# packages/login/src/components/Invalid.tsx
|
2024-07-22 20:23:04 +04:00 |
|
Akmal Isomadinov
|
c0341ddb8b
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-22 18:56:48 +05:00 |
|
Akmal Isomadinov
|
403c98ac38
|
Shared:Components:Selector:Body Fixed height
|
2024-07-22 18:56:30 +05:00 |
|
|
|
44a08b5287
|
Merge branch 'release/v2.6.0' into bugfix/Bug69117
|
2024-07-22 15:20:52 +03:00 |
|
|
|
87f2991d1c
|
Shared: Table: show column when sorting changed
|
2024-07-22 15:20:20 +03:00 |
|
|
|
04d3f01612
|
Web: Files: fixed StyledCircle
|
2024-07-22 15:12:06 +03:00 |
|
|
|
64d1385542
|
Fix Bug 69324 - Settings: Branding. Tab breaks when saving empty Company name
|
2024-07-22 13:12:50 +04:00 |
|
|
|
0db5f272c6
|
Merge branch 'release/v2.6.0' into feature/edge-scrolling
|
2024-07-19 16:53:59 +04:00 |
|
