|
|
daf8dcd71d
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-07-28 11:42:03 +03:00 |
|
|
|
31a50762b0
|
Merge branch 'develop' into features/migrate-urlShortener
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2023-07-26 18:34:33 +03:00 |
|
|
|
f967962c21
|
fix
|
2023-07-26 18:05:09 +03:00 |
|
|
|
7c7f52e51c
|
added ignore pdf download restriction
|
2023-07-26 16:51:22 +03:00 |
|
|
|
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 |
|
|
|
f357362a32
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-07-26 13:01:10 +03:00 |
|
|
|
f10ed6b12a
|
Total parameter replaced by NextPage parameter, refactoring
|
2023-07-26 12:45:07 +03:00 |
|
|
|
ccf13cf375
|
fix Bug 63454
|
2023-07-25 19:25:51 +03:00 |
|
|
|
78c6719a03
|
bug 63390
|
2023-07-25 18:12:08 +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 |
|
|
|
9412c59d83
|
Files: ExternalShare: added Shared property
|
2023-07-24 14:13:43 +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 |
|
|
|
66aae77533
|
Merge branch 'develop' into feature/backup-s3-tar
|
2023-07-20 20:34:41 +03:00 |
|
|
|
ccb67fd783
|
s3 tar backup refactoring
|
2023-07-20 20:33:51 +03:00 |
|
|
|
4fa8de794a
|
Files: optimized build process
|
2023-07-20 19:05:20 +03:00 |
|
|
|
c756261d3b
|
backup tar s3 fix
|
2023-07-20 11:39:17 +03:00 |
|
|
|
57aa77c56f
|
fix build
|
2023-07-19 14:34:00 +03:00 |
|
|
|
df8228ff01
|
fix s3 backup tar
|
2023-07-19 00:19:27 +03:00 |
|
|
|
918f8a0618
|
logger: used only nlog logger provider.
|
2023-07-18 20:05:07 +03:00 |
|
|
|
ab472b0148
|
Merge branch 'master' into develop
# Conflicts:
# .gitignore
# build/install/docker/Dockerfile.dev
# build/install/docker/build.dev.yml
# build/install/docker/docspace.dev.yml
# build/install/win/DocSpace.aip
# 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.ClearEvents/Services/ClearEventsService.cs
# common/services/ASC.ElasticSearch/Core/SearchSettings.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/ASC.Migrations.MySql.csproj
# migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.Designer.cs
# migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.cs
# migrations/mysql/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
# migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.Designer.cs
# migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.cs
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.cs
# migrations/mysql/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.cs
# migrations/mysql/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
# migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.Designer.cs
# migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.cs
# migrations/mysql/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.Designer.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.Designer.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.Designer.cs
# migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.cs
# migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.cs
# migrations/mysql/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
# migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
# migrations/mysql/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
# migrations/postgre/ASC.Migrations.PostgreSql.csproj
# migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.Designer.cs
# migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.cs
# migrations/postgre/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.Designer.cs
# migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.cs
# migrations/postgre/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
# migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.Designer.cs
# migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.cs
# migrations/postgre/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.Designer.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.Designer.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.Designer.cs
# migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.cs
# migrations/postgre/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.cs
# migrations/postgre/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
# migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
# migrations/postgre/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.cs
# migrations/postgre/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.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/Section/SettingsBody/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/common/sub-components/common-tooltips.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/JavascriptSDK/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.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/categories/security/access-portal/sessionLifetime.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.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/VersionHistory/Section/Body/VersionRow.js
# packages/client/src/pages/Wizard/index.js
# packages/client/src/store/AccountsContextOptionsStore.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/components/PrivateRoute/index.js
# packages/common/store/SettingsStore.js
# packages/common/store/UserStore.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/Settings/TfaappController.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-18 19:26:32 +03:00 |
|
|
|
2be4b96ab4
|
Files: fix SetAceObjectAsync for current user
|
2023-07-17 14:29:05 +03:00 |
|
|
|
9b1e13309b
|
Files: fixed leave room
|
2023-07-17 13:06:36 +03:00 |
|
|
|
ca436d75e3
|
removed feedcleaner service
|
2023-07-14 23:12:48 +03:00 |
|
|
|
8b82a9f2de
|
Files: fixed cahnge owner method
|
2023-07-14 18:46:51 +03:00 |
|
|
|
b4ef0eecb8
|
added translations
|
2023-07-14 16:52:19 +03:00 |
|
|
|
9b32618dd2
|
added translations
|
2023-07-14 16:01:54 +03:00 |
|
|
|
057bccb801
|
added translations
|
2023-07-13 18:20:52 +03:00 |
|
|
|
46390d1e30
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-07-13 13:46:08 +03:00 |
|
|
|
835d0e8da0
|
added translations
|
2023-07-13 13:45:17 +03:00 |
|
|
|
dc59259fd0
|
Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.
# Conflicts:
# build/install/OneClickInstall/install-Docker.sh
# build/install/win/DocSpace.aip
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
|
2023-07-13 13:02:08 +03:00 |
|
|
|
0091f02afc
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-07-12 18:21:38 +03:00 |
|
|
|
694bae6d1b
|
added translations
|
2023-07-12 18:20:42 +03:00 |
|
|
|
3f27bb6ce5
|
Merge branch 'develop' into feature/public-room-backend
|
2023-07-12 14:37:37 +03:00 |
|
|
|
c45ae8d990
|
Files: FileShareDto: added expired property, disable expired link
|
2023-07-12 14:23:45 +03:00 |
|
|
|
d749508640
|
Files: ExternalShare: refactoring
|
2023-07-12 14:20:22 +03:00 |
|
|
|
66dcbb3e57
|
Files: ExternalLink: fixed expiration date converting
|
2023-07-12 14:19:58 +03:00 |
|
|
|
040377198f
|
People: filter by employeeTypes
|
2023-07-12 13:10:47 +03:00 |
|
|
|
9c965577ad
|
Files: fixed disabling room invite link after expiration
|
2023-07-12 11:34:28 +03:00 |
|
|
|
812010a8af
|
added translations
|
2023-07-11 18:22:23 +03:00 |
|
|
|
3e18110da9
|
added translations
|
2023-07-10 18:16:31 +03:00 |
|
|
|
62e6431605
|
added translations
|
2023-07-07 14:31:42 +03:00 |
|
|
|
66042b88d4
|
Files: added docservice settings
|
2023-07-07 12:21:13 +03:00 |
|
|
|
7d1d1308e1
|
fix CompileQuery
|
2023-07-06 18:46:35 +03:00 |
|
|
|
f8acd8f647
|
added translations
|
2023-07-06 16:36:28 +03:00 |
|
|
|
cbf7971cd3
|
added translations
|
2023-07-05 17:22:56 +03:00 |
|
|
|
59b9980fd1
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-fixes
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-07-05 16:09:00 +03:00 |
|
|
|
e1e2cce096
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-07-04 18:08:10 +03:00 |
|
|
|
a6954a3764
|
added translations
|
2023-07-04 18:07:50 +03:00 |
|
|
|
f8406c9ba0
|
bug 63258
|
2023-07-04 17:07:08 +03:00 |
|
|
|
047c942bbf
|
bug 63232
|
2023-07-04 15:52:52 +03:00 |
|
|
|
91c3632d6a
|
fix bug 63240
|
2023-07-04 14:38:37 +03:00 |
|
|
|
289ff439e1
|
fix Bug 63241
|
2023-07-04 12:51:00 +03:00 |
|
|
|
35bff2abb7
|
bug 63207
|
2023-07-04 12:14:23 +03:00 |
|
|
|
3c9a253639
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-07-03 17:19:35 +03:00 |
|
|
|
725310d472
|
added translations
|
2023-07-03 17:18:59 +03:00 |
|
|
|
045259a9f2
|
Merge pull request #1499 from ONLYOFFICE/feature/docker-dev
Add docker runtime build images for develop
|
2023-07-03 14:13:33 +04:00 |
|
|
|
70055ba933
|
Merge pull request #1456 from ONLYOFFICE/feature/optimization-queries
Feature/optimization queries
|
2023-07-03 03:05:59 -07:00 |
|
|
|
4305f16845
|
Build: Renamed profiles
|
2023-07-03 12:49:16 +04:00 |
|
|
|
2c540aed25
|
Publish: Added publish profiles for Unix
|
2023-07-03 00:53:29 +04:00 |
|
|
|
9ceda80d78
|
Revert "refactoring"
This reverts commit d4e830a547.
|
2023-07-02 22:48:39 +03:00 |
|
|
|
d4e830a547
|
refactoring
|
2023-07-02 22:34:48 +03:00 |
|
|
|
df2b14a1da
|
removed unused methods
|
2023-07-02 22:00:42 +03:00 |
|
|
|
9b36fe282b
|
Server: Added publish profiles for "ASC.People", "ASC.Web.Studio"
|
2023-07-02 14:54:56 +03:00 |
|
|
|
ed2a2ea9ec
|
Server: Added publish profiles for "ASC.Files", "ASC.People", "ASC.Data.Backup", "ASC.Files.Service", "ASC.Notify", "ASC.Studio.Notify", "ASC.Web.Api", "ASC.Web.Studio", "ASC.Data.Backup.BackgroundTasks", "ASC.ClearEvents", "ASC.ApiSystem", "ASC.Web.HealthChecks.UI"
|
2023-07-02 12:51:28 +03:00 |
|
|
|
4e95a973e0
|
fixed query
|
2023-06-30 17:44:48 +03:00 |
|
|
|
bed46a861b
|
fixed query
|
2023-06-30 13:01:20 +03:00 |
|
|
|
6b4517b5dc
|
Fix bug 63112
|
2023-06-29 19:04:20 +03:00 |
|
|
|
597ce7078e
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-29 18:07:29 +03:00 |
|
|
|
870d4efac5
|
added translations
|
2023-06-29 18:06:36 +03:00 |
|
|
|
ae808e5133
|
fix bug 63181
|
2023-06-29 17:06:31 +03:00 |
|
|
|
a133048c07
|
ASC.People: Registering services for data data reassign task (FileStorageService)
|
2023-06-29 16:12:44 +03:00 |
|
|
|
3254c28429
|
fix
|
2023-06-29 14:33:45 +03:00 |
|
|
|
5f456f3ab6
|
fixed query
|
2023-06-29 14:23:48 +03:00 |
|
|
|
1e71f9f46b
|
fix query
|
2023-06-29 13:33:15 +03:00 |
|
|
|
610345a595
|
fixed query
|
2023-06-29 13:31:47 +03:00 |
|
|
|
295c1948e2
|
fixed query
|
2023-06-29 13:24:41 +03:00 |
|
|
|
c8f453a5e9
|
fremoved unused method
|
2023-06-29 12:07:56 +03:00 |
|
|
|
c21ea30882
|
ASC.Files: ReassignStorageAsync refactoring (deletion of personal data, optimization of data reassignment)
|
2023-06-29 11:53:18 +03:00 |
|
|
|
0e91c423cf
|
fix
|
2023-06-29 11:17:13 +03:00 |
|
|
|
95f86ddd1c
|
fix query
|
2023-06-28 20:36:51 +03:00 |
|
|
|
00a88c9486
|
ASC.Files: ReassignItemsAsync refactoring
|
2023-06-28 16:12:23 +03:00 |
|
|
|
c505c8dc2b
|
added translations
|
2023-06-28 13:35:40 +03:00 |
|
|
|
4bb1475ce9
|
fix query
|
2023-06-28 13:27:32 +03:00 |
|
|
|
bfb9a096e6
|
Merge branch 'develop' into feature/optimization-queries
# Conflicts:
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/ASC.Webhooks.Core/DbWorker.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
|
2023-06-27 18:29:23 +03:00 |
|
|
|
3ba27cd577
|
added translations
|
2023-06-27 16:42:20 +03:00 |
|
|
|
26891975d8
|
Merge branch 'develop' into feature/move-to-selector
|
2023-06-27 13:30:52 +03:00 |
|
|
|
350626d795
|
Files: FilterTypeEnum: removed unnecessary
|
2023-06-27 12:59:18 +03:00 |
|
|
|
36463541d7
|
Files: added apply filter option
|
2023-06-27 12:54:22 +03:00 |
|
|
|
09bc9909d4
|
Merge pull request #1475 from ONLYOFFICE/feature/thumbnails-new-formats
Feature/thumbnails new formats
|
2023-06-27 02:45:21 -07:00 |
|
|
|
f184fa61c6
|
added translations hy
|
2023-06-27 12:38:30 +03:00 |
|
|
|
0bd332d2a9
|
fix migrations
|
2023-06-27 12:18:04 +03:00 |
|
|
|
0b9e19d95f
|
Files: added FoldersDocuments/FoldersImages filters
|
2023-06-26 11:06:34 +03:00 |
|
|
|
0f571bf31b
|
added translations
|
2023-06-23 18:11:24 +03:00 |
|
|
|
c9fced08de
|
fix
|
2023-06-23 15:19:55 +03:00 |
|
|
|
c8b6f7f3f9
|
increase file version if setting is enabled
|
2023-06-23 12:34:30 +03:00 |
|
|
|
4ee5b1ffec
|
fixed 63114
|
2023-06-22 19:43:40 +03:00 |
|
|
|
30233cd8c4
|
added translations
|
2023-06-22 18:09:30 +03:00 |
|
|
|
ebe5553ec4
|
Thumbnails: new formats added according to conversion matrix https://api.onlyoffice.com/editors/conversionapi#text-matrix
|
2023-06-21 12:07:23 +03:00 |
|
|
|
221c28b532
|
Merge branch 'release/v1.1.0' into feature/files-filter-optimization
|
2023-06-19 14:39:05 +03:00 |
|
|
|
b5b865236b
|
added translations
|
2023-06-16 13:54:38 +03:00 |
|
|
|
57f11e874c
|
Files: fix
|
2023-06-16 13:14:49 +03:00 |
|
|
|
c014f904cf
|
Database: added new indexes to tables files_folder/files_file
|
2023-06-16 12:53:27 +03:00 |
|
|
|
0621b040ce
|
Revert "Files: added new database indexes"
This reverts commit 4535d8d7ac.
|
2023-06-16 12:32:38 +03:00 |
|
|
|
ca00ae1ff4
|
Files: fix
|
2023-06-16 12:22:31 +03:00 |
|
|
|
2db64a47e9
|
Files: EntryManager: optimized getting folder content
|
2023-06-15 18:13:04 +03:00 |
|
|
|
4535d8d7ac
|
Files: added new database indexes
|
2023-06-15 16:14:53 +03:00 |
|
|
|
5f9b9ededd
|
Files: added using
|
2023-06-15 16:14:23 +03:00 |
|
|
|
92fe504c60
|
Files: FileSecurity: optimized access check
|
2023-06-15 16:14:12 +03:00 |
|
|
|
1d9aeb3e57
|
Files: added offset/count, added filtered files/folders counting
|
2023-06-15 16:13:28 +03:00 |
|
|
|
317c9635f9
|
Files: chunk upload. Additional field
|
2023-06-14 16:50:01 +03:00 |
|
|
|
903e5679a9
|
fix 62968
|
2023-06-14 13:33:03 +03:00 |
|
|
|
6e07ad70f4
|
refactoring
|
2023-06-14 11:47:11 +03:00 |
|
|
|
54d2c7cffa
|
Files: FilesDbContext: added db functions
|
2023-06-14 11:46:48 +03:00 |
|
|
|
949918202d
|
Files: FileHandler: fixed media files downloading
|
2023-06-13 16:08:41 +03:00 |
|
|
|
083cf7e049
|
Merge pull request #1465 from ONLYOFFICE/feature/cdn-for-dynamic-content
s3: added support presigned cdn url for Media/Image viewer
|
2023-06-10 09:41:51 +03:00 |
|
|
|
680d75b213
|
s3: added support presigned cdn url for Media/Image viewer
|
2023-06-10 09:33:59 +03:00 |
|
|
|
b55b91f5e9
|
added translations
|
2023-06-09 19:10:09 +03:00 |
|
|
|
1905566b90
|
refactoring
|
2023-06-09 14:28:49 +03:00 |
|
|
|
986561d4e9
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/services/ASC.ApiSystem/Controllers/PeopleController.cs
# migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2023-06-08 15:53:31 +03:00 |
|
|
|
65d2343c65
|
added translations
|
2023-06-07 17:40:23 +03:00 |
|
|
|
f681105793
|
Files: ExternalLink: removed min links count rule, added max links count rule
|
2023-06-07 11:19:51 +03:00 |
|
|
|
6888fdbd51
|
added translations
|
2023-06-06 18:47:15 +03:00 |
|
|
|
14483efd34
|
Files: Rooms: fixed default access for public room invite link
|
2023-06-05 17:19:22 +03:00 |
|
|
|
1ea2778562
|
Files: ExternalShare: fixed link
|
2023-06-02 18:38:46 +03:00 |
|
|
|
6a4ebb9854
|
Files: exclude thumbnails from quota
|
2023-06-02 17:08:15 +03:00 |
|
|
|
80deac02c5
|
Merge branch 'develop' into feature/public-room-backend
|
2023-06-02 16:42:16 +03:00 |
|
|
|
f5620a3666
|
Merge branch 'develop' into feature/optimization-queries
|
2023-06-01 23:52:40 +03:00 |
|
|
|
ec65b8b6b8
|
fix
|
2023-06-01 23:21:22 +03:00 |
|
|
|
f451bc51be
|
Files: refactoring
|
2023-06-01 18:14:40 +03:00 |
|
|
|
2fe9912b06
|
Files: ExternalShare: added getting key from header
|
2023-06-01 18:14:28 +03:00 |
|
|
|
9b456a71ae
|
fix
|
2023-06-01 15:59:17 +03:00 |
|
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
|
1dce9ba876
|
refactoring
|
2023-06-01 13:54:19 +03:00 |
|
|
|
9d2ac61d33
|
CompileAsyncQuery: Worker
|
2023-06-01 10:54:35 +03:00 |
|
|
|
dc5d05f5c9
|
CompileAsyncQuery: Token
|
2023-06-01 10:43:08 +03:00 |
|
|
|
0c273ef2fc
|
CompileAsyncQuery: ThumbnailRequestedIntegrationEventHandler
|
2023-06-01 10:38:37 +03:00 |
|
|
|
b63d38b697
|
CompileAsyncQuery: ThirdPartyProviderDao
|
2023-06-01 10:24:12 +03:00 |
|
|
|
5a0276d8a5
|
CompileAsyncQuery: ThirdPartyTagDao
|
2023-06-01 10:20:40 +03:00 |
|
|
|
5961154443
|
CompileAsyncQuery: ThirdPartyFolderDao
|
2023-06-01 10:16:03 +03:00 |
|
|
|
3f5ef209d5
|
StoreForcesave always false
|
2023-05-31 18:53:03 +03:00 |
|
|
|
f00fb9ad4d
|
Forcesave always true
|
2023-05-31 18:49:12 +03:00 |
|
|
|
a093fa8fcd
|
CompileAsyncQuery: ThirdPartyFileDao
|
2023-05-31 18:04:43 +03:00 |
|
|
|
f5f5b851de
|
Files: fixed form saving for mobile app
|
2023-05-31 17:21:19 +03:00 |
|
|
|
b1c741a6d5
|
CompileAsyncQuery: SharpBoxTagDao
|
2023-05-31 16:25:07 +03:00 |
|
|
|
4f648b00b1
|
CompileAsyncQuery: SharpBoxFolderDao
|
2023-05-31 15:01:41 +03:00 |
|
|
|
b1eec9510b
|
CompileAsyncQuery: SharpBoxFileDao
|
2023-05-31 14:49:08 +03:00 |
|
