IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,752 Commits 40 Branches 22 Tags 420 MiB
765559f55c
Commit Graph

36752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akmal Isomadinov
c94fb18329 Web:PDFViewer Fixed error handling in the PDF-viewer and fixed the ability to download PDF files 2023-07-26 19:05:50 +05:00
Evgeniy Antonyuk
281122602c Add an environment file for redis configuration in packages 2023-07-26 18:55:29 +05:00
MaksimChegulov
242f532648 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-26 16:51:39 +03:00
MaksimChegulov
7c7f52e51c added ignore pdf download restriction 2023-07-26 16:51:22 +03:00
Aleksandr Lushkin
9acbcfb45c Web: Components: Fix scrollbar crash when clientX 0 2023-07-26 15:23:42 +02:00
Akmal Isomadinov
dc0c5f9e09 Web:MediaViewer Fixed the ability to download files in the media viewer 2023-07-26 18:21:12 +05:00
Nasrullo Nurullaev
ebe3a50f99
Fix issue with installing MySQL prerequisites (#1589) 2023-07-26 17:46:23 +05:00
Aleksandr Lushkin
3afb08e154 Web: Components: Refactor scrollbar component 2023-07-26 14:20:33 +02:00
pavelbannov
ee2b62c7b5 UrlShortener: fix migrations 2023-07-26 15:17:07 +03:00
Nasrullo Nurullaev
69e7a63b44
fix Bug 63398 - Made versions of prerequisites in Win consistent with the rest (#1580) 
* fix Bug 63398 - Made versions of prerequisites in Win packages consistent with others

* Update psql ODBC driver

* Edit psqlodbc driver name
 2023-07-26 17:03:21 +05:00
pavelbannov
028b63213c Merge branch 'develop' into features/migrate-urlShortener 
# Conflicts:
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs
#	migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs
#	migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
 2023-07-26 14:30:00 +03:00
Viktor Fomin
fdfffb020b Merge branch 'develop' into feature/deep-link 2023-07-26 14:23:37 +03:00
Aleksandr Lushkin
63ee6c4c65 Web: Client: Refactor tab position functions 2023-07-26 13:09:22 +02:00
Alexey Safronov
9bf024a63c Merge branch 'develop' into feature/public-room 2023-07-26 13:45:01 +04:00
pavelbannov
e66137a6ed fix 2023-07-26 12:44:18 +03:00
Alexey Safronov
76f1f9bb38 Merge branch 'develop' into feature/public-room 2023-07-26 13:34:03 +04:00
pavelbannov
fc0744f6b3 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-07-26 12:27:51 +03:00
pavelbannov
c0e44e97f3 Rebranding available only for standalone 2023-07-26 12:27:20 +03:00
Alexey Safronov
d2020ff2f1 Update docspace.overcome.yml 
Added port mapping for document-server container
 2023-07-26 13:25:25 +04:00
Andrey Savihin
343c3f766c fix Bug 63409 - Welcome letter markup 2023-07-26 11:53:24 +03:00
Alexey Safronov
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
pavelbannov
ccf13cf375 fix Bug 63454 2023-07-25 19:25:51 +03:00
gopienkonikita
2853735615 Web: Files: EditLinkPanel: fixed mobile view 2023-07-25 19:14:52 +03:00
gopienkonikita
a67f301608 Web: Files: fixed translations 2023-07-25 19:04:28 +03:00
gopienkonikita
cffbf97517 Web: Files: EditLinkPanel: fixed onCopyClick 2023-07-25 19:01:13 +03:00
gopienkonikita
1b8fb5ca59 Web: Files: EmbeddingBody: fixed CodeCopySuccess translation 2023-07-25 19:00:48 +03:00
gopienkonikita
6de49aff28 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/AppServer into feature/public-room 2023-07-25 18:51:29 +03:00
gopienkonikita
960e0655bb Web: Files: fixed table after merge 2023-07-25 18:51:16 +03:00
MaksimChegulov
eca1088d72 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-25 18:36:43 +03:00
MaksimChegulov
ca8c144080 Files: Settings: removed socket url for anonymous if there is no token in request 2023-07-25 18:36:31 +03:00
gopienkonikita
3d3f244cc1 Web: Files: fixed RoomSharingDialog styles 2023-07-25 18:32:22 +03:00
gopienkonikita
f4e2f76fff Web: Editor: fixed goBack 2023-07-25 18:27:43 +03:00
pavelbannov
78c6719a03 bug 63390 2023-07-25 18:12:08 +03:00
Elbakyan Shirak
1b15421796
Fix no space left on device error (#1588) 2023-07-25 20:02:19 +05:00
gopienkonikita
a1a2d5aa4a Web: Files: fixed files open 2023-07-25 17:59:25 +03:00
Elbakyan Shirak
1f5f196f3b
Add concurrency in actions (#1587) 2023-07-25 19:56:35 +05:00
gopienkonikita
7917549533 Web: Files: fixed double share url 2023-07-25 17:44:56 +03:00
Evgeniy Antonyuk
ab6920145a
fix Bug 63456 - Change the redirecturl value in production configuration (#1584) 2023-07-25 19:31:34 +05:00
gopienkonikita
2e42741e4b Web: Files: fixed public-room error after added new file 2023-07-25 17:27:11 +03:00
Alexey Safronov
234c8b0178 Merge branch 'develop' into feature/public-room 2023-07-25 17:52:13 +04:00
Sergey Linnik
ca3f18e385 Merge branch 'fix-conflicts-merge' into develop 2023-07-25 16:14:32 +03:00
Sergey Linnik
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
Sergey Linnik
7af87c5d17 Merge remote-tracking branch 'remotes/origin/develop' into fix-conflicts-merge 2023-07-25 16:05:26 +03:00
Sergey Linnik
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
Aleksandr Lushkin
cd41c8387b Fix scrollbar conflicts after merge 2023-07-25 14:03:41 +02:00
Aleksandr Lushkin
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
Aleksandr Lushkin
35b5b1c560 Web: Components: Adapt drag and drop component to RTL 2023-07-25 13:53:32 +02:00
Evgeniy Antonyuk
4fcb79e498 Disable debug-info by default for win package 2023-07-25 15:07:31 +05:00
Alexey Safronov
f3765018f1 Web: bump version 2023-07-25 14:02:50 +04:00