Commit Graph

37674 Commits

Author SHA1 Message Date
725ca4c16b Web: Backup: fixed file selection for third-party accounts. 2023-09-05 10:33:07 +03:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
1e23dad91e
Merge pull request #1689 from ONLYOFFICE/feature/change-chunk-size-s3-copy-and-backup
change chunk size
2023-09-04 13:12:49 -07:00
2b86dd25df Merge branch 'develop' into feature/change-chunk-size-s3-copy-and-backup
# Conflicts:
#	config/backup.json
2023-09-04 23:11:47 +03:00
d864448da5 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
2023-09-04 23:01:50 +03:00
2fd15b4108
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
2023-09-04 10:44:38 -07:00
a40294f624 fixed tag new creating after copy 2023-09-04 20:11:09 +03:00
7f9286219c optimized access check 2023-09-04 20:10:13 +03:00
e5b3d44bc3 fixed calculating hash 2023-09-04 19:55:54 +03:00
715c21f090 added ko, sk 2023-09-04 18:21:40 +03:00
761765cd2b Web: SDK: Allow calling framesdk function on editor.requestClose 2023-09-04 16:52:44 +03:00
83bc2edd02 Web: bump version to v1.1.3 2023-09-04 17:43:24 +04:00
3986e1fb98
Merge pull request #1700 from ONLYOFFICE/feature/zoom-login
Feature/zoom login
2023-09-04 16:38:37 +03:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
178534e9f1
Merge pull request #1701 from ONLYOFFICE/feature/zoom-browser
Feature/zoom browser
2023-09-04 16:34:59 +03:00
613938b819 Web: Added Zoom login button, translates and icons 2023-09-04 16:06:55 +03:00
2cdac01a1e Merge branch 'feature/zoom-browser' of https://github.com/ONLYOFFICE/DocSpace into feature/zoom-browser 2023-09-04 17:00:08 +04:00
ba2233ca7a common: move cspsettings from web.api to core.common project 2023-09-04 15:13:18 +03:00
887985a665 Web: Added check for userAgent of Zoom app 2023-09-04 15:11:02 +03:00
4c0ccdb2b9 Web: Added new editor.requestClose param to client config
(cherry picked from commit 70a18018c3104f9d400fa53a57f37eb9bdbc6d71)
2023-09-04 15:11:02 +03:00
13c2a16a23 Web: Added new config option window.DocSpaceConfig?.editor?.openOnNewPage (fix zoom client issues)
(cherry picked from commit ff25c784dee494bd29444f80ca1267248e13c41b)
2023-09-04 15:11:01 +03:00
69165ea30f Web: Client: fix getting dates in portal language format instead of user language in info panel 2023-09-04 13:50:30 +02:00
f6ca59874d zoom: add keys and add in AuthProviders 2023-09-04 14:46:48 +03:00
f406e9eb3d Web: Added check for userAgent of Zoom app 2023-09-04 15:40:03 +04:00
63e0f44964 Merge branch 'develop' into feature/tag-new-optimization 2023-09-04 14:32:04 +03:00
f40940f73c Web: Added new editor.requestClose param to client config
(cherry picked from commit 70a18018c3104f9d400fa53a57f37eb9bdbc6d71)
2023-09-04 13:52:32 +03:00
b911f0aa19 Web: Added new config option window.DocSpaceConfig?.editor?.openOnNewPage (fix zoom client issues)
(cherry picked from commit ff25c784dee494bd29444f80ca1267248e13c41b)
2023-09-04 13:52:32 +03:00
e09e6cc3a6 refactoring 2023-09-04 13:39:15 +03:00
Viktor Fomin
d709ea7eaa Client: PortalSettings: BackupList: fix crash 2023-09-04 13:25:50 +03:00
1f3d63be3d optimized socket notification on tag changes 2023-09-04 13:20:32 +03:00
c1bf6bf308 added new texts ru 2023-09-04 12:57:19 +03:00
cddc823173 Merge branch 'develop' into feature/appearance-mobile-layout
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/Appearance/StyledApperance.js
2023-09-04 12:18:59 +03:00
e9fcf067ee Merge branch 'develop' into feature/new-settings-description
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
#	packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
2023-09-04 12:16:13 +03:00
Viktor Fomin
e2bf5997f9 Client: Dialogs: CreateRoomDialog: delete useless 2023-09-04 12:06:02 +03:00
Viktor Fomin
68101de683 Components: ModalDialog: fix height 2023-09-04 12:05:39 +03:00
392a908c57
fix Bug 63573 - Add the ability to automatically switch to SSL (#1662) 2023-09-04 12:03:36 +03:00
Viktor Fomin
52e9ddf70e Merge branch 'develop' into feature/sso-mobile-layout 2023-09-04 11:47:20 +03:00
Viktor Fomin
8d052886d1 Merge branch 'develop' into feature/branding-mobile-layout 2023-09-04 11:47:10 +03:00
Viktor Fomin
67b323328a Client: PortalSettings: Branding: fix style 2023-09-04 11:44:57 +03:00
21f8f74f47 BabelEdit: Fix open projects (client, common) 2023-09-04 12:09:46 +04:00
7d141a2aa4 Temporarily fix nodejs installation for Centos 8 Stream 2023-09-04 12:55:53 +05:00
913a8178d8
Merge pull request #1655 from ONLYOFFICE/bugfix/fix-selection
Web:Client:FilesActionsStore: clear selection after open new folder
2023-09-04 10:17:49 +03:00
969ddbe162 Web: fix Invalid Host header on WP:DevServer with domain 2023-09-04 11:13:04 +04:00
Viktor Fomin
1518740cc5 Client: PortalSettings: SSO: fix styles 2023-09-04 10:13:02 +03:00
ef36eaafca
Cosmetic changes in build packages action (#1695) 2023-09-04 11:41:02 +05:00
Viktor Fomin
f2d5d32268 Merge branch 'develop' into bugfix/login-page 2023-09-02 15:48:01 +03:00
Viktor Fomin
d061c5b68d Client: PortalSettings: fix 2023-09-02 15:44:17 +03:00
Viktor Fomin
cd75d9c4d9 Client: PortalSettings: fix 2023-09-02 15:41:50 +03:00
e5739f1109 Fix the problem with different redis config locations 2023-09-02 15:46:09 +05:00
Viktor Fomin
3f63a0b27c Merge branch 'develop' into feature/sso-mobile-layout 2023-09-02 01:07:54 +03:00