|
5abcef74f5
|
Change hardware requirements for OCI installation
|
2023-08-03 12:44:23 +05:00 |
|
|
d8d864692a
|
fix bug 63390
|
2023-08-02 20:02:38 +03:00 |
|
|
a9e609e57d
|
revert 78c6719a03
|
2023-08-02 20:00:25 +03:00 |
|
|
81907e9247
|
Web: Client: Fix getting wrong scroll elements
|
2023-08-02 17:56:06 +02:00 |
|
|
06777b395a
|
Merge pull request #1600 from ONLYOFFICE/feature/api-descriptions
Feature/api descriptions
|
2023-08-02 08:09:52 -07:00 |
|
|
62801e136a
|
Merge branch 'hotfix/v1.1.2' into bugfix/bug-63501
|
2023-08-02 18:12:31 +04:00 |
|
|
204de7c5c9
|
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-02 17:10:34 +03:00 |
|
|
49c32801d7
|
Fix bug 63472 - Removed badges "paid" from accounts and invite panel for standalone mode.
|
2023-08-02 17:08:48 +03:00 |
|
|
c4f386e0d0
|
Update yarn.lock
|
2023-08-02 18:07:19 +04:00 |
|
|
da1d505265
|
Merge pull request #1582 from ONLYOFFICE/feature/refactoring-nlog
Feature/refactoring nlog
|
2023-08-02 07:05:14 -07:00 |
|
|
bdcaadccdc
|
fix warning
|
2023-08-02 17:04:41 +03:00 |
|
|
c360f224cf
|
Merge branch 'develop' into feature/refactoring-nlog
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# config/nlog.config
|
2023-08-02 16:52:12 +03:00 |
|
Akmal Isomadinov
|
065a4b1aa3
|
Web:Fixed bug 63501
|
2023-08-02 18:39:02 +05:00 |
|
Viktor Fomin
|
3380e0a73c
|
Fix Bug 63514: Error "/api/2.0/settings/ssov2 500" when navigating to another page
|
2023-08-02 15:03:30 +03:00 |
|
|
8f904890ac
|
Merge pull request #1596 from ONLYOFFICE/bugfix/63492
Bugfix/63492
|
2023-08-02 04:12:40 -07:00 |
|
|
4d2254d870
|
Merge pull request #1599 from ONLYOFFICE/feature/api-develop
Feature/api develop
|
2023-08-02 04:11:18 -07:00 |
|
|
fd0364d70b
|
Merge pull request #1597 from ONLYOFFICE/feature/cookie-login-event-id
Feature/cookie login event id
|
2023-08-02 04:09:33 -07:00 |
|
|
9608079922
|
fix Bug 61700
|
2023-08-02 13:40:54 +03:00 |
|
|
a52f889884
|
Files: fixed MoveOrCopyBatchCheckFullAsync
|
2023-08-02 12:53:33 +03:00 |
|
|
9d0cde9c5c
|
Web: Fix start socket
|
2023-08-02 13:31:20 +04:00 |
|
|
08dc00bae5
|
Update yarn.lock
|
2023-08-02 12:52:27 +04:00 |
|
|
31c0629bc5
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-08-02 10:49:16 +02:00 |
|
Nasrullo Nurullaev
|
6b574e6be9
|
fix Bug 62882 - Edit description and display names in node services (#1603)
|
2023-08-02 11:11:21 +03:00 |
|
Nasrullo Nurullaev
|
afacc23957
|
fix Bug 62877 - Fix issue with access to the doceditor (#1601)
|
2023-08-02 10:27:59 +03:00 |
|
|
2e12a2e8ad
|
Web: Client: Apply changes by commits ea40ba3738 and 1b9dc04f30 after merge
|
2023-08-02 10:21:21 +03:00 |
|
|
d86fe1bc9d
|
Web: Client: Apply changes by commit c56324863d after merge
|
2023-08-02 10:00:42 +03: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 |
|
|
34a675c62c
|
api: fix documentation
|
2023-08-01 17:50:47 +03:00 |
|
Nasrullo Nurullaev
|
ab534f3f56
|
fix Bug 63367 - Update licenses (#1594)
* fix Bug 63367 - Update licenses
* Small fixes
|
2023-08-01 17:16:31 +03:00 |
|
|
b2235b90cb
|
Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeFullDto.cs
# common/ASC.Core.Common/Core/UserInfo.cs
# common/ASC.Core.Common/EF/FireBaseUser.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.IPSecurity/Models/IPRestriction.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Helpers/DocumentService.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Server/Api/EditorController.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.Files/Server/Api/ThirdpartyController.cs
# products/ASC.Files/Server/Api/UploadController.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/ContactsController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
# web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
# web/ASC.Web.Api/Api/Settings/LdapController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/NotificationController.cs
# web/ASC.Web.Api/Api/Settings/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/SsoController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/VersionController.cs
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
|
2023-08-01 17:07:05 +03:00 |
|
Subhonbek
|
982d2f41ec
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-08-01 16:19:35 +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 |
|
|
ea40ba3738
|
Web: Added error on empty files list on OperationPanel
|
2023-08-01 13:31:58 +04:00 |
|
|
df20e9e624
|
api: fix documentation
|
2023-08-01 11:53:00 +03:00 |
|
|
d2e23e3ed4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
# Conflicts:
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/CapabilitiesController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/SmtpSettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
|
2023-08-01 11:39:57 +03:00 |
|
|
81b8e1a2f8
|
ASC.Core.Common: SecurityContext: checking loginEventId for 0
|
2023-08-01 10:36:11 +03:00 |
|
|
a508c7002a
|
fix Bug 63492 - Welcome letter markup
|
2023-07-31 23:53:12 +03:00 |
|
Akmal Isomadinov
|
3ecc713adc
|
Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-07-31 20:43:29 +05:00 |
|
Akmal Isomadinov
|
57292da345
|
Web:Client Fixed bug 63458
|
2023-07-31 20:43:12 +05:00 |
|
|
9c17f3bd56
|
Web: Common: fix section-body_header overlapping vertical scrollbar
|
2023-07-31 17:38:00 +02:00 |
|
|
48da6bb520
|
Web: Client: Components: Move id to top div of Scrollbar component. Add class to wrapper element of Scrollbar
|
2023-07-31 17:18:05 +02:00 |
|
|
c75ddfcd18
|
bug 63454: logging
|
2023-07-31 16:51:33 +03:00 |
|
Akmal Isomadinov
|
3ce9a1a354
|
Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-07-31 16:53:39 +05:00 |
|
Akmal Isomadinov
|
85fe59a8a3
|
Web:Common Fixed bug 63494
|
2023-07-31 16:52:51 +05:00 |
|
|
1b9dc04f30
|
Fixed Bug 63479 - Files.’Something went wrong’ on copy files
|
2023-07-31 14:59:33 +04:00 |
|
|
1e1551f9c0
|
fix Bug 63497
|
2023-07-31 11:59:43 +03:00 |
|
|
30c4e4bbaa
|
Web: bump version to v1.1.2
|
2023-07-28 21:03:52 +04:00 |
|
Akmal Isomadinov
|
c56324863d
|
Web:Client Fixed bug 63436
|
2023-07-28 20:04:40 +05:00 |
|
|
e99ce6d9d8
|
Web: Components: Avoid using unnecessary callbacks when autoHide is disabled
|
2023-07-28 14:17:56 +02:00 |
|
|
e4ea5a4606
|
Merge pull request #1595 from ONLYOFFICE/hotfix/1.1.1
Hotfix/1.1.1
|
2023-07-28 14:19:29 +03:00 |
|