|
ba38054f16
|
Shared:Constants: add OPEN_BACKUP_CODES_DIALOG constant
|
2024-08-12 15:38:06 +04:00 |
|
|
8dac5fbb9f
|
Shared:Api:People: change types
|
2024-08-12 13:00:41 +04:00 |
|
|
cc3fc541d6
|
Shared:Components: change import types
|
2024-08-12 10:53:00 +04:00 |
|
|
b404c0eb15
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:51:42 +04:00 |
|
|
a2302aa248
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/Confirm/sub-components/activateUser.js
# packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js
# packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js
# packages/login/src/app/(root)/layout.tsx
# packages/login/src/app/(root)/page.tsx
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/types/index.ts
# packages/login/src/utils/actions.ts
# packages/shared/constants/index.ts
# packages/shared/themes/base.ts
|
2024-08-09 17:23:25 +04:00 |
|
|
ac5094c2ea
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:15:21 +04:00 |
|
|
359536724a
|
Merge pull request #579 from ONLYOFFICE/bugfix/login-thirdparty-blinking
Bugfix/login thirdparty blinking
|
2024-08-09 15:54:47 +04:00 |
|
|
d7d48ec228
|
Client:Packages:Shared: fix redirect between pages wizard and unavailable
|
2024-08-09 14:10:16 +04:00 |
|
|
4218510853
|
Shared: Themes: Fix tag color in light theme
|
2024-08-09 10:19:23 +02:00 |
|
|
7dc348e05a
|
Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-08-09 10:04:31 +03:00 |
|
|
9421289e2e
|
Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-08-08 17:48:59 +03:00 |
|
|
a5560a7411
|
Shared: fix SSR issue
|
2024-08-08 16:40:51 +03:00 |
|
|
2fffc86593
|
Shared:Components:Checkbox: fix styles for label and help button
|
2024-08-08 16:39:43 +03:00 |
|
|
ee3ff7ed09
|
Merge branch 'hotfix/v2.6.1' into feature/api-separation
|
2024-08-08 14:38:16 +04:00 |
|
|
30a82687c6
|
Web: Components: Table: fixed resetColumns
|
2024-08-08 12:33:12 +03:00 |
|
|
7b14d0bc98
|
Shared:Components: fix defaultProps
|
2024-08-08 11:03:46 +03:00 |
|
|
ee7724bf6b
|
Shared:Components: fix defaultProps
|
2024-08-07 17:44:47 +03:00 |
|
|
46bfdde9fc
|
Shared: Fixed type.
|
2024-08-07 16:47:17 +03:00 |
|
|
024e5de12b
|
Web: Files: EditLinkPanel: replaced PasswordInput with SimulatePassword
|
2024-08-07 16:41:45 +03:00 |
|
|
4dc40f5154
|
Shared: Themes: fix
|
2024-08-07 15:16:53 +03:00 |
|
|
ebbdbaab73
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-07 14:18:27 +04:00 |
|
|
a15e40d24d
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/shared/components/share/sub-components/LinkRow.tsx
|
2024-08-07 11:47:58 +04:00 |
|
|
9231d7faae
|
Merge pull request #575 from ONLYOFFICE/feature/scrolling-skeleton
Web: Components: InfiniteLoader: added skeleton when quickly scrollin…
|
2024-08-06 18:47:22 +04:00 |
|
|
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 |
|
|
6601566913
|
Shared: Api: People: Added loginEventId to user type
|
2024-08-05 17:58:59 +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 |
|