|
|
6c357ea855
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace-client into feature/public-room
|
2024-02-01 11:36:42 +03:00 |
|
|
|
04a31c61d0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
# packages/shared/components/navigation/Navigation.tsx
# packages/shared/components/navigation/Navigation.types.ts
# packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 11:36:29 +03:00 |
|
|
|
91165250d6
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-31 21:01:07 +04:00 |
|
|
|
ce696a19f2
|
Fix display badge inside Room InfoiPanel
|
2024-01-31 20:57:14 +04:00 |
|
|
|
b187939065
|
Merge branch 'develop' into feature/public-room
|
2024-01-31 20:07:01 +04:00 |
|
|
|
2c91c5ec1e
|
Merge branch 'develop' into bugfix/textarea
|
2024-01-31 19:46:53 +04:00 |
|
|
|
54ed8d7e1d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/PublicRoom/sub-components/RoomPassword.js
# packages/login/src/client/components/CodeLogin.tsx
# packages/login/src/client/components/Login.tsx
|
2024-01-31 19:45:25 +04:00 |
|
|
|
5c59c1e5d5
|
Login: Added setIsLoaded call command for embedded
|
2024-01-31 14:13:39 +03:00 |
|
|
|
06307a8dbe
|
PublicRoom: Added setIsLoaded call command for embedded
|
2024-01-31 14:13:20 +03:00 |
|
|
|
0054c2b1ad
|
PortalSettings: JS-SDK: Fixed preview border size
|
2024-01-31 14:12:17 +03:00 |
|
|
|
35f9dae56f
|
Web: Files: fixed color crash
|
2024-01-31 13:49:14 +03:00 |
|
Vladimir Khvan
|
f3f6f981ca
|
Web: Shared: heightTextArea was cast to union of string and number | error indication was fixed
|
2024-01-31 12:48:23 +05:00 |
|
|
|
3fd7599021
|
Fix Bug 66263 - Rooms. ‘Warning. Operation is not valid due to the current state of the object.’
|
2024-01-31 01:36:05 +04:00 |
|
|
|
c4f5aaf0ee
|
Fix Bug 66093 - Files. The Create room menu item has a Power user type in My Documents.
|
2024-01-31 00:51:15 +04:00 |
|
|
|
e20ae17ab8
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/Sdk/index.js
# packages/editor/src/client/components/Editor.js
# packages/shared/selectors/Room/index.tsx
|
2024-01-30 18:33:56 +04:00 |
|
|
|
e4b8a87971
|
Web: Files: fixed color crash, fixed info-panel for media viewer
|
2024-01-30 17:09:17 +03:00 |
|
|
|
3a6f97088e
|
PortalSettings: JS-SDK: Fixed border for frame container
|
2024-01-30 16:15:14 +03:00 |
|
|
|
42cfb4173e
|
Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader
|
2024-01-30 14:44:36 +03:00 |
|
|
|
391a85b1a3
|
Fix open public room (isCollaborator of null)
|
2024-01-30 15:43:29 +04:00 |
|
|
|
496e2de0d2
|
Fix Bug 65381 - Rooms. Public. Fixed opening files of unsupported formats.
|
2024-01-30 14:13:30 +03:00 |
|
|
|
56c71f61af
|
Web: Files: Public-room: fixed icon
|
2024-01-30 14:03:50 +03:00 |
|
|
|
ffebe34043
|
Web: Files: fixed onCreateAndCopySharedLink, fixed showNavigationButton
|
2024-01-30 13:22:10 +03:00 |
|
|
|
e5e80704c3
|
Web: Files: fixed haveLinksRight
|
2024-01-30 13:13:30 +03:00 |
|
|
|
4364f20f6a
|
Web: Files: added public badge
|
2024-01-30 13:05:17 +03:00 |
|
|
|
7a548bd571
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-30 12:13:15 +03:00 |
|
Vladimir Khvan
|
d9e7652f9e
|
Web: heightTextArea was changed to string
|
2024-01-30 13:54:49 +05:00 |
|
|
|
cad2686988
|
Web: Files: fixed RoomIcon
|
2024-01-30 11:28:38 +03:00 |
|
Vladimir Khvan
|
2e70879a95
|
Web: Components: textarea: heightTextArea prop was cast to string
Conflicts:
packages/components/textarea/textarea.stories.js
packages/shared/components/textarea/README.md
packages/shared/components/textarea/Textarea.styled.tsx
packages/shared/components/textarea/Textarea.tsx
|
2024-01-30 13:19:50 +05:00 |
|
|
|
c1d0bb9995
|
Web: Files: Public-room: fixed links row
|
2024-01-30 11:05:54 +03:00 |
|
Vladimir Khvan
|
9924b25b4b
|
Web: Components: textarea: warning was fixed
Conflicts:
packages/shared/components/textarea/Textarea.tsx
|
2024-01-30 12:49:57 +05:00 |
|
Vladimir Khvan
|
cfa93b96ca
|
Web: Components: textarea: numeration was fixed
Conflicts:
packages/shared/components/textarea/Textarea.styled.tsx
|
2024-01-30 12:46:52 +05:00 |
|
|
|
8d1e01db69
|
Fix display labels
|
2024-01-29 23:20:22 +04:00 |
|
|
|
230b8cdd7a
|
Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader
|
2024-01-29 21:46:15 +03:00 |
|
|
|
5600f52c59
|
Main: Fixed stopping render for iframe mode
|
2024-01-29 21:41:00 +03:00 |
|
|
|
4abcf1e88c
|
Restore enable third-party switch
|
2024-01-29 21:07:45 +04:00 |
|
|
|
d34f1c9e33
|
Restored third-parties api methods
|
2024-01-29 21:07:00 +04:00 |
|
|
|
5a8ecadf78
|
Removed debugger
|
2024-01-29 19:14:53 +04:00 |
|
|
|
a9c09f9e6c
|
Merge branch 'develop' into bugfix/thirdparty
|
2024-01-29 19:08:55 +04:00 |
|
|
|
68f74565bc
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/common/store/AuthStore.js
# packages/shared/components/selector/Selector.tsx
|
2024-01-29 19:07:27 +04:00 |
|
|
|
efeb9be315
|
Web: Files: Public-room: added navigation button, added new icons
|
2024-01-29 17:55:55 +03:00 |
|
|
|
a9f723cd2e
|
Web:Shared:Fixed incorrect table length after closing the info panel.
|
2024-01-29 17:12:19 +03:00 |
|
|
|
61e16730f3
|
Merge branch 'hotfix/v2.0.2' into bugfix/66114
|
2024-01-29 17:20:18 +04:00 |
|
|
|
6693823584
|
Fix Bug 66046 - Rooms.Tags. It is not possible to change the tag in the room.
|
2024-01-29 17:19:28 +04:00 |
|
|
|
19e9079671
|
Web: Files: Public-room: fixed translations
|
2024-01-29 15:48:52 +03:00 |
|
|
|
2b9cbb6a5b
|
Client: TariffBar: refactoring, hidden bar
|
2024-01-29 15:37:38 +03:00 |
|
|
|
3ad5322a2e
|
Fixed bug 66114 - Account: The left menu tabs do not switch when changing content through the context menu.
|
2024-01-29 15:21:39 +03:00 |
|
|
|
a1fc8864b0
|
Editor: added new favicon for PDF files
|
2024-01-29 15:48:57 +04:00 |
|
|
|
68b049d7da
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-29 14:24:42 +03:00 |
|
|
|
48f2f54bde
|
Shared: Navigation: add types
|
2024-01-29 14:24:10 +03:00 |
|
|
|
72da51aeea
|
Shared: Navigation: move tariff bar
|
2024-01-29 14:23:54 +03:00 |
|
