|
|
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 |
|
|
|
a1a2d5aa4a
|
Web: Files: fixed files open
|
2023-07-25 17:59:25 +03:00 |
|
|
|
7917549533
|
Web: Files: fixed double share url
|
2023-07-25 17:44:56 +03: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 |
|
|
|
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 |
|
|
|
3958e9f156
|
Web: Client: Fixed FilesFilter
|
2023-07-24 17:50:40 +03:00 |
|
|
|
5a893a8a0a
|
Web: Files: Public-room fixed access for users with authorization, refactoring
|
2023-07-24 14:41:26 +03:00 |
|
|
|
9412c59d83
|
Files: ExternalShare: added Shared property
|
2023-07-24 14:13:43 +03:00 |
|
|
|
0459e319e4
|
Users: fixed checking CountPaidUserFeature
|
2023-07-24 13:58:14 +03:00 |
|
|
|
7b2ac0bd28
|
fixed payment/account
|
2023-07-24 13:32:34 +03:00 |
|
|
|
a8921b44e0
|
fix
|
2023-07-24 11:59:20 +03:00 |
|
|
|
61d088ac19
|
Merge pull request #1581 from ONLYOFFICE/release/v1.1.0
Release/v1.1.0
|
2023-07-24 01:34:41 -07:00 |
|
|
|
d0479ea5bd
|
Merge branch 'master' into release/v1.1.0
|
2023-07-24 11:33:18 +03:00 |
|
|
|
ba218993c9
|
Merge pull request #1579 from ONLYOFFICE/feature/fixed-license
fixed license upload
|
2023-07-24 12:25:05 +04:00 |
|
|
|
b4b80db882
|
fixed license upload
|
2023-07-22 19:36:09 +03:00 |
|
|
|
b4502b6fba
|
fix license
|
2023-07-21 18:41:16 +03:00 |
|
|
|
e32679287c
|
fix
|
2023-07-21 17:04:48 +03:00 |
|
|
|
f503ea5d7f
|
fix
|
2023-07-21 17:02:33 +03:00 |
|
|
|
997ce4945c
|
Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge
|
2023-07-21 16:52:02 +03:00 |
|
|
|
545bacfaf0
|
Merge branch 'develop' into fix-conflicts-merge
# Conflicts:
# packages/client/src/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/FileShareOptions.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2023-07-21 16:51:49 +03:00 |
|
|
|
c17d23e792
|
Files: fix
|
2023-07-21 16:24:41 +03:00 |
|
Viktor Fomin
|
461112a7f3
|
Client: Profile: fix warning
|
2023-07-21 12:38:57 +03:00 |
|
|
|
4df4b2939c
|
Web: Section: Fixed wrong location of close icon.
|
2023-07-21 12:31:30 +03:00 |
|
|
|
e88d23cf50
|
Web: InvitePanel: Deleted useless ref code.
|
2023-07-21 12:15:01 +03:00 |
|
|
|
5bb6c6a8f4
|
Web: Fixed display of files loading during operations on it.
|
2023-07-21 11:14:18 +03:00 |
|
|
|
9c0459af58
|
Change storage directory in packages (#1577)
|
2023-07-21 12:47:13 +05:00 |
|
|
|
4fa8de794a
|
Files: optimized build process
|
2023-07-20 19:05:20 +03:00 |
|
|
|
d900d2ebdf
|
Build: Docker: Added installation type args to build.backend.docker.ps1
|
2023-07-20 18:06:17 +03:00 |
|
|
|
9edac50b3d
|
Build: Added --community param to run docker in community version
|
2023-07-20 17:55:58 +04:00 |
|
|
|
27e9135d9d
|
Add nodejs 18 installation for supported OS (#1562)
|
2023-07-20 17:02:19 +05:00 |
|
|
|
6d335dfc19
|
Fix local domain check in docker OCI (#1571)
|
2023-07-20 17:01:43 +05:00 |
|
|
|
58f3d5e275
|
Temporarily fix missing mysql package files for debian buster (#1570)
https://bugs.mysql.com/bug.php?id=111786
|
2023-07-20 17:00:29 +05:00 |
|
Viktor Fomin
|
69d002d44a
|
Client: fix accountLoginType empty screen
|
2023-07-20 14:30:50 +03:00 |
|
|
|
8ae847e57f
|
Merge pull request #1564 from ONLYOFFICE/bugfix/63381
Bugfix/63381
|
2023-07-20 13:43:20 +03:00 |
|
Viktor Fomin
|
7dbef13bc1
|
Client: return changeOwner route
|
2023-07-20 13:38:42 +03:00 |
|
|
|
23584368ed
|
Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge
|
2023-07-20 13:33:58 +03:00 |
|
|
|
695be3d804
|
Web:Client: fix redirect from /accounts
|
2023-07-20 13:33:52 +03:00 |
|
|
|
9b14175dd5
|
License: fix
|
2023-07-20 13:32:01 +03:00 |
|
|
|
bc3e3faf13
|
Web: Files: fixed AccessSelector
|
2023-07-20 12:00:48 +03:00 |
|
