gazizova-vlada
|
9d4db20180
|
Merge branch 'develop' into feature/reassign-data
|
2023-08-08 11:39:24 +03:00 |
|
gazizova-vlada
|
34553e8c7d
|
Web:Client:Add translation.
|
2023-08-08 11:20:24 +03:00 |
|
gazizova-vlada
|
6cbabab61d
|
Web:Client:Fix sort option reassign-data.
|
2023-08-07 16:29:56 +03:00 |
|
gazizova-vlada
|
f040a79780
|
Web:Client:Fix styles dialog.
|
2023-08-07 16:17:50 +03:00 |
|
gazizova-vlada
|
f70eeba100
|
Web:Client:Change users to user.
|
2023-08-07 15:09:27 +03:00 |
|
gazizova-vlada
|
70c9ac594b
|
Web:Client:Change users to user, change translations.
|
2023-08-07 15:08:44 +03:00 |
|
gazizova-vlada
|
5ee93c10fa
|
Web:Client:Change users to user.
|
2023-08-07 15:07:50 +03:00 |
|
gazizova-vlada
|
c3b28ab524
|
Web:Client:Delete translations for users.
|
2023-08-07 15:07:10 +03:00 |
|
|
|
a493b539d6
|
Merge pull request #1553 from ONLYOFFICE/feature/deep-link
Feature/deep link
|
2023-08-07 12:58:16 +04:00 |
|
|
|
cd8900b6f5
|
Web: Commented log
|
2023-08-07 12:56:09 +04:00 |
|
|
|
b666fe0c57
|
Merge branch 'develop' into feature/deep-link
|
2023-08-07 12:36:27 +04:00 |
|
|
|
92d8e97021
|
Update yarn.lock
|
2023-08-07 12:26:45 +04:00 |
|
|
|
d51185872b
|
Web: fix empty Rooms loading
|
2023-08-07 12:23:02 +04:00 |
|
gazizova-vlada
|
82449e934d
|
Web:Client:Fix option reassign-data for admin.
|
2023-08-07 10:47:07 +03: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 |
|
|
|
7438caeead
|
HealthCheck: ApiCache doesn't start
|
2023-08-04 17:48:52 +03:00 |
|
|
|
e80fd2a74e
|
fixed ArgumentOutOfRangeException
|
2023-08-04 17:42:14 +03:00 |
|
|
|
c8f06c967c
|
Merge pull request #1514 from ONLYOFFICE/feature/rtl-interface-direction
Feature/rtl interface direction
|
2023-08-04 17:28:00 +03:00 |
|
|
|
21ec023a25
|
Merge pull request #1609 from ONLYOFFICE/feature/api-docs
Api docs
|
2023-08-04 13:51:28 +03:00 |
|
|
|
6c1edce8c6
|
added api docs 1.1.1
|
2023-08-03 16:50:57 +03:00 |
|
|
|
fcebc17e60
|
fix after merge
|
2023-08-03 14:13:27 +03:00 |
|
|
|
81907e9247
|
Web: Client: Fix getting wrong scroll elements
|
2023-08-02 17:56:06 +02: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 |
|
|
|
4d2254d870
|
Merge pull request #1599 from ONLYOFFICE/feature/api-develop
Feature/api develop
|
2023-08-02 04:11:18 -07: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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
