|
|
68c06ac91a
|
Merge branch 'feature/VDR-room' into feature/VDR-lifetime
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/components/QuickButtons.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/components/selector/Selector.types.ts
# packages/components/selector/index.tsx
# packages/components/selector/sub-components/Body/Body.types.ts
# packages/components/selector/sub-components/Item/Item.types.ts
# packages/components/selector/sub-components/Item/StyledItem.ts
# packages/components/selector/sub-components/Item/index.tsx
# packages/components/themes/base.js
# packages/shared/components/navigation/Navigation.tsx
# packages/shared/components/selector/sub-components/Body.tsx
# packages/shared/themes/dark.ts
|
2024-05-21 14:38:28 +03:00 |
|
|
|
a3c9c55ad4
|
Merge branch 'develop' into feature/VDR-room
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
|
2024-05-21 12:55:23 +03:00 |
|
|
|
bd00879ddf
|
Merge pull request #404 from ONLYOFFICE/refactoring/sdk-presets
refactoring/sdk-presets
|
2024-05-21 13:13:02 +04:00 |
|
|
|
3801069692
|
Merge pull request #417 from ONLYOFFICE/bugfix/profile-active-sessions
bugfix/profile-active-sessions
|
2024-05-21 13:10:59 +04:00 |
|
|
|
778fbb2c95
|
added comma after country
|
2024-05-21 13:48:56 +05:00 |
|
|
|
382dee0e2c
|
refactored conditions for row view
|
2024-05-21 13:42:07 +05:00 |
|
|
|
03eade0701
|
refactored conditions
|
2024-05-21 13:38:27 +05:00 |
|
|
|
45c380a488
|
removed duplicate divider
|
2024-05-21 13:28:33 +05:00 |
|
|
|
835e99dc05
|
removed duplicate divider
|
2024-05-21 13:21:13 +05:00 |
|
|
|
980637fcf1
|
added additional conditions
|
2024-05-21 13:04:52 +05:00 |
|
|
|
2b6514d6e4
|
fixed condition for displaying country and city
|
2024-05-21 12:52:41 +05:00 |
|
Vladimir Khvan
|
21bf244d7c
|
Web: Client: JavascriptSDK: fixed onChangeFileId function in viewer preset
|
2024-05-20 14:39:34 +05:00 |
|
|
|
5430fcda99
|
Merge pull request #416 from ONLYOFFICE/bugfix/editor-internal-requests
Bugfix/editor internal requests
|
2024-05-17 17:54:23 +04:00 |
|
|
|
bbe48c781b
|
Doceditor: disable internal requests
|
2024-05-17 16:50:22 +03:00 |
|
|
|
b7259b61de
|
Shared:Utils:NextSSRHelper: add flag for disable internal requests
|
2024-05-17 16:50:07 +03:00 |
|
|
|
68655585ab
|
Merge pull request #415 from ONLYOFFICE/bugfix/sso
bugfix/sso
|
2024-05-17 16:32:46 +04:00 |
|
|
|
a9470a8b3e
|
Client: SSO: fix
|
2024-05-17 15:28:32 +03:00 |
|
|
|
034a296045
|
Client: SSO: restore label
|
2024-05-17 15:28:17 +03:00 |
|
|
|
9ed710a80f
|
Merge pull request #414 from ONLYOFFICE/bugfix/public-preview
Shared:Components:MediaViewer Fixed dragging on mobile devices
|
2024-05-17 16:12:47 +04:00 |
|
Akmal Isomadinov
|
a394731684
|
Shared:Components:MediaViewer Fixed dragging on mobile devices
|
2024-05-17 17:04:45 +05:00 |
|
|
|
1826310dcb
|
Merge pull request #413 from ONLYOFFICE/bugfix/67476
Fixed Bug 67476 - Client crashes when changing scripts 'Load chunk fa…
|
2024-05-17 15:23:13 +04:00 |
|
|
|
d8faea6f73
|
Merge pull request #401 from ONLYOFFICE/feature/layout
feature/layout
|
2024-05-17 15:21:22 +04:00 |
|
Akmal Isomadinov
|
1b1fbf82ba
|
Merge branch 'feature/layout' of github.com:ONLYOFFICE/DocSpace-client into feature/layout
|
2024-05-17 16:09:49 +05:00 |
|
|
|
048cbbd1a3
|
Merge branch 'develop' into feature/layout
|
2024-05-17 14:56:51 +04:00 |
|
|
|
b4d441e558
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-17 14:56:11 +04:00 |
|
|
|
2300fb55d2
|
Merge branch 'develop' into bugfix/67476
|
2024-05-17 13:15:16 +03:00 |
|
|
|
973f6576d5
|
Fixed Bug 67476 - Client crashes when changing scripts 'Load chunk failed.'
|
2024-05-17 13:12:15 +03:00 |
|
|
|
c24bc8f655
|
Merge pull request #412 from ONLYOFFICE/bugfix/Bug66413
bugfix/Bug66413
|
2024-05-17 14:09:16 +04:00 |
|
|
|
8bc6ec6ecd
|
Fix Bug 66413
Can't change SSO server settings from combobox
|
2024-05-17 12:37:43 +03:00 |
|
Akmal Isomadinov
|
ed154cb0eb
|
Merge branch 'develop' into feature/layout
|
2024-05-17 14:16:40 +05:00 |
|
|
|
d768e0bdba
|
Merge pull request #409 from ONLYOFFICE/feature/login-nextjs
Fix base url
|
2024-05-17 12:41:47 +04:00 |
|
|
|
2f425bf005
|
Fix base url
|
2024-05-17 11:38:05 +03:00 |
|
|
|
3891662031
|
Merge pull request #408 from ONLYOFFICE/feature/login-nextjs
Fix internal requests
|
2024-05-17 11:27:42 +04:00 |
|
|
|
e60eb8ca0d
|
Login: delete useless
|
2024-05-17 10:22:20 +03:00 |
|
|
|
bdab93673a
|
Shared:Utils: fix origin header for internal requests
|
2024-05-17 10:21:34 +03:00 |
|
|
|
697c109062
|
Merge pull request #407 from ONLYOFFICE/feature/login-nextjs
Login: remove sending promise from server to client
|
2024-05-17 10:18:54 +04:00 |
|
|
|
df71fe91dc
|
Login: remove sending promise from server to client
|
2024-05-17 09:14:25 +03:00 |
|
|
|
9c19eb6521
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-16 19:08:24 +04:00 |
|
|
|
c83438c960
|
Merge pull request #406 from ONLYOFFICE/feature/login-nextjs
Remove internal requests
|
2024-05-16 18:57:18 +04:00 |
|
|
|
2d042b0b77
|
Login: add check for API_HOST
|
2024-05-16 17:23:53 +03:00 |
|
|
|
22af34cf00
|
Remove internal requests
|
2024-05-16 17:16:18 +03:00 |
|
Akmal Isomadinov
|
6359bf7eee
|
Doceditor:App:Create Fixed redirect URL
|
2024-05-16 19:03:18 +05:00 |
|
Vladimir Khvan
|
d066f71833
|
Merge branch 'develop' into refactoring/sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
|
2024-05-16 18:31:10 +05:00 |
|
namushka
|
3c3349ed04
|
Merge branch 'hotfix/v2.5.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.5.1
|
2024-05-16 16:00:39 +03:00 |
|
Vladimir Khvan
|
624efcda9b
|
Web: Client: JavascriptSDK: removed redundant code
|
2024-05-16 17:48:44 +05:00 |
|
Vladimir Khvan
|
f25156d571
|
Web: Client: JavascriptSDK: isolated preview block
|
2024-05-16 17:41:42 +05:00 |
|
|
|
b1c8b05852
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-16 16:40:43 +04:00 |
|
Akmal Isomadinov
|
aafc126f01
|
Merge branch 'develop' into feature/layout
|
2024-05-16 17:40:16 +05:00 |
|
Akmal Isomadinov
|
96e02a9f4c
|
Client:Shell Fixed re-rendering of main bar when resizing
|
2024-05-16 17:04:21 +05:00 |
|
namushka
|
438f7b40af
|
fixed <ContextButton/> component wrong icon color
|
2024-05-16 14:59:02 +03:00 |
|
