Commit Graph

37359 Commits

Author SHA1 Message Date
3f43b0b9c2
Merge pull request #1703 from ONLYOFFICE/feature/tag-new-optimization
feature/tag new optimization
2023-09-07 10:23:57 +03:00
4b61c98dbf
Merge pull request #1696 from ONLYOFFICE/bugfix/modal-height
bugfix/modal-height
2023-09-07 11:00:03 +04:00
3a0b0623b4 Merge branch 'develop' into bugfix/modal-height 2023-09-07 10:46:08 +04:00
dcfc3e7857
Merge pull request #1711 from ONLYOFFICE/feature/docker-local-dns 2023-09-06 18:14:52 +03:00
4aa80e2fb5 build: docker: dev: fix variable 2023-09-06 19:09:35 +04:00
bc57cd84d0 build: docker: dev: added dnsmasq for local domain routing 2023-09-06 18:24:58 +04:00
2e17d714ca Web: Fix search is not defined 2023-09-05 17:52:01 +04:00
d96e45abb7 Update yarn.lock 2023-09-05 12:08:32 +04: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
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
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
1f3d63be3d optimized socket notification on tag changes 2023-09-04 13:20:32 +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
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
ef36eaafca
Cosmetic changes in build packages action (#1695) 2023-09-04 11:41:02 +05:00
e5739f1109 Fix the problem with different redis config locations 2023-09-02 15:46:09 +05:00
0d870f8e77
Merge pull request #1641 from ONLYOFFICE/bugfix/calendar-ui
bugfix/calendar-ui
2023-09-02 00:08:24 +04:00
cf528ac224
Merge pull request #1657 from ONLYOFFICE/bugfix/people-selector
bugfix/people selector
2023-09-01 23:59:11 +04:00
f8ddf23e16
Merge pull request #1660 from ONLYOFFICE/bugfix/dropdown-edits
Bugfix/dropdown edits
2023-09-01 23:58:27 +04:00
fa368adb4d
Merge pull request #1667 from ONLYOFFICE/bugfix/contextmenu-offset
bugfix/contextmenu-offset
2023-09-01 23:57:37 +04:00
001d2d313f
Merge pull request #1677 from ONLYOFFICE/bugfix/info-panel-toggle-button
Web:Common:Navigation: hide toggle button, when info panel is opened
2023-09-01 23:10:17 +04:00
12a1ee2912
Merge pull request #1671 from ONLYOFFICE/bugfix/crash-after-invite-users
Client: fix crash after invite users click
2023-09-01 23:08:23 +04:00
b7e8a3b581
Merge pull request #1678 from ONLYOFFICE/bugfix/fixed-tile-view
Bugfix/fixed tile view
2023-09-01 23:05:20 +04:00