Commit Graph

288 Commits

Author SHA1 Message Date
69c4dfebbb Merge branch 'release/v2.0.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.0.0 2023-11-12 12:46:35 +03:00
6349c1359e Web: Fixed display of icons with extensions in the dialog. 2023-11-12 12:45:57 +03:00
65bf52310b Merge branch 'release/v2.0.0' into bugfix/portal-restriction 2023-11-10 22:47:44 +04:00
240b75ae39 Web: Editor: Added redirect to error page from editor. 2023-11-10 13:07:20 +03:00
3987fc0eeb Fixed paths 2023-11-10 11:20:02 +04:00
ae70d5ea00 editor/login: ignore /health request 2023-11-09 19:58:03 +03:00
f86a27c51e Fix false alarm on socket "restore-backup" 2023-11-03 00:30:29 +04:00
34298bdc16 Fixed Bug 64961 - Login: Security. XSS injection takes place at the URL to enter the page 2023-11-02 18:09:40 +03:00
3a1a46f692 Fixed Bug 57821. Added detect ui theme for Desktop Editors. Added change tab color for Desktop Editors 2023-10-26 14:43:39 +03:00
Viktor Fomin
e9d3b83ee0 Editor: add without_redirect param 2023-10-25 14:57:07 +03:00
b0869f8036 Web: Editor: fixed getBackUrl 2023-10-25 12:29:07 +03:00
525eb1bdc4 Replaced deprecated methods and events + fixed selector texts 2023-10-23 20:48:09 +04:00
47c278f4ff Added new event - onRequestOpen 2023-10-23 13:57:07 +04:00
38b1bb5c06
Merge pull request #16 from ONLYOFFICE/feature/room-primary-link
Feature/room primary link
2023-10-17 18:45:29 +04:00
2f3d186cd0 Web: Editor: fixed editorConfig lang 2023-10-17 13:46:51 +03:00
564c2c5419 Bump version to v2.0.0 2023-10-16 13:33:51 +04:00
Akmal Isomadinov
9071e541db Client: Fixed language change 2023-10-12 20:25:55 +05:00
85033463e7 Web: Editor: fixed crash 2023-10-10 09:57:07 +03:00
b4a6f6c148 Fix editor/login config's paths on publish 2023-10-04 00:09:35 +04:00
db2b2170e9 merge from master 2023-10-03 17:26:38 +03:00
27ae382c4e Changed path to buildtools 2023-10-03 11:45:09 +04:00
d0add3dbb1 Changed paths (to publish/web) 2023-10-02 16:49:15 +04:00
f188adc1e5 Web: Client: Fixed appsettings path 2023-10-02 14:16:20 +03:00
db3f75c78b added translations 2023-09-07 18:40:17 +03:00
2e17d714ca Web: Fix search is not defined 2023-09-05 17:52:01 +04:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04: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
f406e9eb3d Web: Added check for userAgent of Zoom app 2023-09-04 15:40:03 +04: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
800fe94f27 added ar Editor.json, Login.json, Errors.json 2023-08-25 15:43:21 +03:00
c109f47267 Web: Editor: Client: Common: Replace rtl language to ltr in Editor 2023-08-21 14:48:28 +02:00
e531654c54 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
cd8900b6f5 Web: Commented log 2023-08-07 12:56:09 +04:00
Viktor Fomin
a484ad73d5 Editor: fix theme 2023-08-05 23:23:09 +03:00
Viktor Fomin
8b6282f2ee Editor: fix for empty config 2023-08-04 19:04:16 +03:00
638807a0e0 Merge branch 'develop' into feature/deep-link 2023-08-04 19:01:14 +04:00
b90002c4fe Merge branch 'hotfix/v1.1.2' into bugfix/bug-63501 2023-08-04 15:33:46 +04:00
cfccb454a3 Web: Editor: Server: Added correct headers for each instance of axios client 2023-08-04 14:13:59 +03:00
Akmal Isomadinov
77b96e92c5 Web: Fixed the path to the CSS file 2023-08-04 15:25:28 +05:00
8ba1099358 Web: Optimize fonts import 2023-08-03 21:54:09 +04:00
12558b8520 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/components/panels/OperationsPanel/index.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	yarn.lock
2023-08-01 17:56:22 +03:00
51fb13d035 Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/pages/Files.jsx
#	packages/common/components/Navigation/Navigation.js
#	packages/common/components/Navigation/sub-components/control-btn.js
#	packages/common/components/Navigation/sub-components/plus-btn.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	yarn.lock
2023-08-01 14:39:31 +03:00
30c4e4bbaa Web: bump version to v1.1.2 2023-07-28 21:03:52 +04:00
f4e2f76fff Web: Editor: fixed goBack 2023-07-25 18:27:43 +03:00
f3765018f1 Web: bump version 2023-07-25 14:02:50 +04:00
7d727e0842 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
2023-07-25 13:01:21 +03:00
Viktor Fomin
09a50c84a5 Merge branch 'develop' into feature/deep-link 2023-07-25 12:54:36 +03:00
92194e786b Node: Services: Added new logLevel param 2023-07-24 14:03:52 +04:00