|
|
d2020ff2f1
|
Update docspace.overcome.yml
Added port mapping for document-server container
|
2023-07-26 13:25:25 +04:00 |
|
|
|
343c3f766c
|
fix Bug 63409 - Welcome letter markup
|
2023-07-26 11:53:24 +03:00 |
|
|
|
8990e5c07f
|
Update yarn.lock
|
2023-07-26 11:10:25 +04:00 |
|
Subhonbek
|
76166f032a
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-07-26 09:03:58 +03:00 |
|
|
|
ccf13cf375
|
fix Bug 63454
|
2023-07-25 19:25:51 +03:00 |
|
|
|
2853735615
|
Web: Files: EditLinkPanel: fixed mobile view
|
2023-07-25 19:14:52 +03:00 |
|
|
|
a67f301608
|
Web: Files: fixed translations
|
2023-07-25 19:04:28 +03:00 |
|
|
|
cffbf97517
|
Web: Files: EditLinkPanel: fixed onCopyClick
|
2023-07-25 19:01:13 +03:00 |
|
|
|
1b8fb5ca59
|
Web: Files: EmbeddingBody: fixed CodeCopySuccess translation
|
2023-07-25 19:00:48 +03:00 |
|
|
|
6de49aff28
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/AppServer into feature/public-room
|
2023-07-25 18:51:29 +03:00 |
|
|
|
960e0655bb
|
Web: Files: fixed table after merge
|
2023-07-25 18:51:16 +03:00 |
|
|
|
eca1088d72
|
Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room
|
2023-07-25 18:36:43 +03:00 |
|
|
|
ca8c144080
|
Files: Settings: removed socket url for anonymous if there is no token in request
|
2023-07-25 18:36:31 +03:00 |
|
|
|
3d3f244cc1
|
Web: Files: fixed RoomSharingDialog styles
|
2023-07-25 18:32:22 +03:00 |
|
|
|
f4e2f76fff
|
Web: Editor: fixed goBack
|
2023-07-25 18:27:43 +03:00 |
|
|
|
78c6719a03
|
bug 63390
|
2023-07-25 18:12:08 +03:00 |
|
|
|
1b15421796
|
Fix no space left on device error (#1588)
|
2023-07-25 20:02:19 +05:00 |
|
|
|
a1a2d5aa4a
|
Web: Files: fixed files open
|
2023-07-25 17:59:25 +03:00 |
|
|
|
1f5f196f3b
|
Add concurrency in actions (#1587)
|
2023-07-25 19:56:35 +05:00 |
|
|
|
7917549533
|
Web: Files: fixed double share url
|
2023-07-25 17:44:56 +03:00 |
|
|
|
ab6920145a
|
fix Bug 63456 - Change the redirecturl value in production configuration (#1584)
|
2023-07-25 19:31:34 +05:00 |
|
|
|
2e42741e4b
|
Web: Files: fixed public-room error after added new file
|
2023-07-25 17:27:11 +03:00 |
|
|
|
234c8b0178
|
Merge branch 'develop' into feature/public-room
|
2023-07-25 17:52:13 +04:00 |
|
|
|
ca3f18e385
|
Merge branch 'fix-conflicts-merge' into develop
|
2023-07-25 16:14:32 +03:00 |
|
|
|
cbb4098e21
|
Merge remote-tracking branch 'remotes/origin/master' into fix-conflicts-merge
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
|
2023-07-25 16:12:56 +03:00 |
|
|
|
7af87c5d17
|
Merge remote-tracking branch 'remotes/origin/develop' into fix-conflicts-merge
|
2023-07-25 16:05:26 +03:00 |
|
|
|
f76376986a
|
Merge commit 'ad29f7def85b96e538343240642425e18572cf28' into fix-conflicts-merge
# Conflicts:
# .gitignore
# common/ASC.ActiveDirectory/Base/DbHelper.cs
# common/ASC.Api.Core/Model/EmployeeDto.cs
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Messaging/MessagesContext.cs
# common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# common/Tools/ASC.Migration.Runner/ASC.Migration.Runner.csproj
# common/Tools/ASC.Migration.Runner/GlobalUsings.cs
# common/Tools/ASC.Migration.Runner/MigrationRunner.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
# common/Tools/ASC.Migrations.Core/Models/ConfigurationInfo.cs
# common/Tools/ASC.Migrations.Core/Utils/DbContextActivator.cs
# common/services/ASC.ElasticSearch/Core/SearchSettings.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# packages/client/src/Shell.jsx
# packages/client/src/components/Article/Body/Items.js
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
# packages/client/src/components/EmptyContainer/RootFolderContainer.js
# packages/client/src/components/panels/InvitePanel/index.js
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/components/panels/InvitePanel/sub-components/Item.js
# packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
# packages/client/src/components/panels/SelectFileDialog/AsideView.js
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
# packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# packages/client/src/components/panels/SelectionPanel/StyledSelectionPanel.js
# packages/client/src/pages/Accounts.jsx
# packages/client/src/pages/AccountsHome/index.js
# packages/client/src/pages/Confirm/index.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/Errors/520/index.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/Certificates.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/FieldMapping.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/IdpSettings.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/ProviderMetadata.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
# packages/client/src/pages/PortalSettings/categories/payments/index.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/pages/Profile/Section/Body/sub-components/interface-theme/index.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js
# packages/client/src/pages/Wizard/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-alerts.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/FilterInput/sub-components/FilterBlock.js
# packages/common/components/Loaders/index.js
# packages/common/components/MediaViewer/sub-components/ImageViewer/ImageViewer.props.ts
# packages/common/components/MediaViewer/sub-components/ImageViewer/index.tsx
# packages/common/store/SettingsStore.js
# packages/common/utils/index.ts
# packages/components/file-input/index.js
# packages/components/selector/StyledSelector.js
# packages/components/selector/index.tsx
# packages/components/selector/sub-components/Body/index.tsx
# packages/components/slider/styled-slider.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Service/Cleanup/Worker.cs
# products/ASC.People/Server/Api/UserController.cs
# public/scripts/api.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/SmtpSettingsController.cs
# web/ASC.Web.Api/Core/SmtpOperation.cs
# web/ASC.Web.Core/CookiesManager.cs
# yarn.lock
|
2023-07-25 16:05:12 +03:00 |
|
|
|
cd41c8387b
|
Fix scrollbar conflicts after merge
|
2023-07-25 14:03:41 +02:00 |
|
|
|
28b8bc346e
|
Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
# .gitignore
# packages/common/store/SettingsStore.js
# packages/components/file-input/styled-file-input.js
# packages/components/modal-dialog/styled-modal-dialog.js
# yarn.lock
|
2023-07-25 14:01:29 +02:00 |
|
|
|
35b5b1c560
|
Web: Components: Adapt drag and drop component to RTL
|
2023-07-25 13:53:32 +02:00 |
|
|
|
4fcb79e498
|
Disable debug-info by default for win package
|
2023-07-25 15:07:31 +05: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 |
|
|
|
ac32bd5c1c
|
Web: Removed useless package
|
2023-07-25 13:52:47 +04:00 |
|
|
|
ee56dc8ffb
|
Update yarn.lock
|
2023-07-25 13:21:17 +04:00 |
|
|
|
f135f37e06
|
fix Bug 63409 - Welcome letter markup
|
2023-07-24 21:29:56 +03:00 |
|
|
|
06bf62f3c3
|
Smtp: fixed delete smtp method
|
2023-07-24 18:10:07 +03:00 |
|
|
|
3958e9f156
|
Web: Client: Fixed FilesFilter
|
2023-07-24 17:50:40 +03:00 |
|
|
|
4454282e91
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-07-24 15:23:59 +02:00 |
|
|
|
800a5e3ccf
|
Web: SDK: Fixed property name
|
2023-07-24 16:13:53 +03:00 |
|
|
|
5e101d33f7
|
Common: Navigation: Added action buttons for frame mode
|
2023-07-24 16:10:02 +03:00 |
|
|
|
92a54c1951
|
Web: Client: Files: Restored mobile main button for frame mode after bad merge
|
2023-07-24 15:48:04 +03:00 |
|
|
|
693fb73412
|
Prevent interactive information from being displayed to user
|
2023-07-24 17:39:04 +05:00 |
|
|
|
35b36cc3dc
|
Revert "Temporarily fix missing mysql package files for debian buster (#1570)"
This reverts commit 58f3d5e275.
|
2023-07-24 17:38:39 +05:00 |
|
|
|
589018903b
|
fix Bug 63382 - Change default logging to warning
|
2023-07-24 17:36:56 +05:00 |
|
|
|
c94448c0e1
|
Optimize unnecessary substitution of postman value
|
2023-07-24 17:03:42 +05:00 |
|
|
|
6ee5dc0263
|
Merge remote-tracking branch 'origin/feature/rtl-interface-direction' into feature/rtl-interface-direction
|
2023-07-24 13:53:25 +02:00 |
|
|
|
5a893a8a0a
|
Web: Files: Public-room fixed access for users with authorization, refactoring
|
2023-07-24 14:41:26 +03:00 |
|
|
|
55b6297928
|
Web: Components: Fix scroll when file element is not visible
|
2023-07-24 13:40:56 +02:00 |
|
Subhonbek
|
a2d6b0baf2
|
web component rtl fix arrow selector
|
2023-07-24 14:15:24 +03:00 |
|
