|
|
cbd7fa9c41
|
Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors
|
2024-01-30 19:19:30 +03:00 |
|
|
|
8c290e42d4
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-30 19:12:22 +03:00 |
|
|
|
883eb94fc9
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-30 19:11:57 +03:00 |
|
|
|
4ea916942b
|
Shared:selectors:Files: fix
|
2024-01-30 19:00:02 +03:00 |
|
|
|
2193d6c2f0
|
Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors
|
2024-01-30 18:44:24 +03:00 |
|
|
|
ddf000f11b
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-30 18:43:08 +03:00 |
|
|
|
f8c71851fc
|
Client:Components:FilesSelector: fix after move to shared
|
2024-01-30 18:42:05 +03:00 |
|
|
|
3be4e2a822
|
Fix after merge 'develop'
|
2024-01-30 17:55:31 +03:00 |
|
|
|
94eaa55676
|
Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors
|
2024-01-30 17:53:18 +03:00 |
|
|
|
4f87ca3527
|
Common:Loaders: delete useless
|
2024-01-30 17:47:06 +03:00 |
|
|
|
79d2861d1a
|
Shared:Selectors:Files: move from client
|
2024-01-30 17:39:36 +03: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 |
|
|
|
7080f38c28
|
Merge pull request #183 from ONLYOFFICE/feature/js-sdk-loader
web client - add loader in sdk
|
2024-01-30 18:15:46 +04: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 |
|
|
|
9fe30d3be4
|
Added hide loader on CSP/CORS error
|
2024-01-30 13:27:14 +04:00 |
|
|
|
153ce3749c
|
Shared:Selectors:Room: fix types
|
2024-01-30 11:09:00 +03:00 |
|
|
|
5c446bbf71
|
Fix after merge 'develop'
|
2024-01-30 10:45:13 +03:00 |
|
|
|
c2431cc9f2
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-30 09:32:51 +03:00 |
|
|
|
9a3279c6d7
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-30 09:32:03 +03:00 |
|
|
|
3663294938
|
Merge pull request #211 from ONLYOFFICE/bugfix/thirdparty
Bugfix/thirdparty
|
2024-01-29 23:21:27 +04: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 |
|
|
|
1b1ccfdd05
|
JS-SDK: Api: Fixed frame container init. Added loader container. Added loader remove on load finished. Added theme for loader container.
|
2024-01-29 21:44:39 +03:00 |
|
|
|
de24cb3330
|
Images: Loader: Fixed js-sdk loader
|
2024-01-29 21:41:29 +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 |
|
|
|
8e9b300952
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-29 19:32:16 +03:00 |
|
|
|
8132bfdae9
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-29 19:30:18 +03: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 |
|
|
|
7d68cefc56
|
Merge pull request #210 from ONLYOFFICE/bugfix/fix-table
bugfix/fix-table
|
2024-01-29 18:31:42 +04:00 |
|
|
|
a9f723cd2e
|
Web:Shared:Fixed incorrect table length after closing the info panel.
|
2024-01-29 17:12:19 +03:00 |
|
|
|
9ecc62d2b7
|
Merge pull request #209 from ONLYOFFICE/bugfix/66114
Fixed bug 66114 - Account: The left menu tabs do not switch when chan…
|
2024-01-29 17:31:42 +04:00 |
|
|
|
004818d522
|
Client:Store:Wizzard: rewrite to typescript
|
2024-01-29 16:23:37 +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 |
|
|
|
643be9c63b
|
Client:PortalSettings:Payments: fix paymentStore
|
2024-01-29 16:13:33 +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 |
|
|
|
e5b351aaf2
|
Client: rename payments store to paymentsStore
|
2024-01-29 14:13:28 +03:00 |
|
|
|
2ec90add8d
|
Fix Bug 66093 - Files. The Create room menu item has a Power user type in My Documents.
|
2024-01-29 15:05:54 +04:00 |
|
|
|
8f4471e1c3
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-29 14:05:16 +03:00 |
|
|
|
6d61917078
|
Client:Store:Payment: rewrite to typescript
|
2024-01-29 14:05:12 +03:00 |
|
|
|
a4e4ab8e7b
|
Client: fix import
|
2024-01-29 13:54:50 +03:00 |
|
|
|
a3cc0093eb
|
Client: delete console log
|
2024-01-29 13:14:43 +03:00 |
|
|
|
0f2b3bcd1d
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-29 13:07:36 +03:00 |
|
