|
|
9608079922
|
fix Bug 61700
|
2023-08-02 13:40:54 +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 |
|
|
|
f58d19b510
|
Files: added storage handler for files_template module
|
2023-07-28 16:09:24 +03:00 |
|
|
|
d9347095a3
|
UrlShortener: removed nodejs project
|
2023-07-26 18:49:50 +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 |
|
|
|
ae507d2ff8
|
Merge branch 'feature/web-plugins' into feature/web-plugins-backend
|
2023-07-26 10:19:40 +03:00 |
|
|
|
ed82c9f661
|
Merge branch 'develop' into feature/web-plugins
|
2023-07-26 10:17:59 +03:00 |
|
Viktor Fomin
|
09a50c84a5
|
Merge branch 'develop' into feature/deep-link
|
2023-07-25 12:54:36 +03:00 |
|
|
|
92194e786b
|
Node: Services: Added new logLevel param
|
2023-07-24 14:03:52 +04:00 |
|
|
|
2eb132fc7e
|
Delete service for web plugins
|
2023-07-19 18:58:17 +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 |
|
Viktor Fomin
|
3369372ea5
|
Config: fix
|
2023-07-17 13:50:56 +03:00 |
|
Viktor Fomin
|
78b6c43d74
|
Merge branch 'develop' into feature/deep-link
|
2023-07-17 13:24:15 +03:00 |
|
|
|
6450348370
|
removed connection to radical
|
2023-07-15 11:08:59 +03:00 |
|
|
|
b2810c1234
|
config: web plugins settings
|
2023-07-14 22:31:26 +03:00 |
|
|
|
097b89b42f
|
Merge branch 'release/v1.1.0' into feature/csp
|
2023-07-11 16:30:42 +03:00 |
|
|
|
b3afd051af
|
Csp: lua script, CspSettingsHelper, portalrename, dns change, domains array
|
2023-07-11 16:21:48 +03:00 |
|
|
|
173e9473a6
|
Settings: added apiDocsLink
|
2023-07-07 11:53:23 +03:00 |
|
|
|
0f0cfc6094
|
config: added storage for web plugins
|
2023-07-05 12:24:21 +03:00 |
|
|
|
3d6eea02a9
|
added PaymentAccountHandler
|
2023-06-20 12:24:47 +03:00 |
|
|
|
4920c975c1
|
Added support of new hy-AM culture
|
2023-06-16 13:28:56 +04:00 |
|
|
|
6bd422fa35
|
nlog: ignore '/health' request
|
2023-06-15 16:51:26 +03:00 |
|
|
|
8b371f1aa7
|
Nginx: added Strict-Transport-Security and X-Content-Type-Options headers
|
2023-06-07 12:32:26 +03:00 |
|
|
|
a1c4dffd33
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-07 10:27:38 +03:00 |
|
|
|
812a570e51
|
Firebase: added config for mobile application
|
2023-06-07 10:27:26 +03:00 |
|
|
|
75a83f3253
|
Now setting "CanIndexByContent" is always true
|
2023-06-06 18:27:40 +03:00 |
|
|
|
6ff6db06fe
|
Config: Added new firebase field "databaseURL"
|
2023-06-02 19:30:00 +04:00 |
|
|
|
f4983243f9
|
added samesite option
|
2023-06-01 19:02:21 +03:00 |
|
|
|
c98752746e
|
Nginx: Fix bad favicon on login and editor
|
2023-05-30 19:09:28 +04:00 |
|
|
|
443bd12881
|
Nginx: Fix bad favicon on login and editor
|
2023-05-30 18:56:29 +04:00 |
|
|
|
cb623476ce
|
Consumers: removed SmscProvider
|
2023-05-26 15:31:08 +03:00 |
|
|
|
449709b18f
|
appsetting: change tab to spaces
|
2023-05-22 22:15:33 +03:00 |
|
|
|
914d7856ff
|
thumbnails: setup MaxDegreeOfParallelism
|
2023-05-22 22:10:15 +03:00 |
|
|
|
15b5aaaf83
|
Revert "removed products"
This reverts commit fee81e8a3b.
|
2023-05-11 11:26:28 +03:00 |
|
|
|
fee81e8a3b
|
removed products
|
2023-05-10 10:57:06 +03:00 |
|
|
|
ee00d8ff68
|
default server root config
|
2023-05-08 22:40:45 +03:00 |
|
|
|
e121471aa2
|
nginx: removed support custom x-rewriter-url header
|
2023-05-04 18:24:55 +03:00 |
|
|
|
c61c938729
|
removed x-rewriter-url
|
2023-05-03 20:25:50 +03:00 |
|
|
|
658ac5102f
|
nginx: change server_names_hash_bucket_size
|
2023-05-03 14:57:11 +03:00 |
|
|
|
a9ef26af20
|
nginx: fixed
|
2023-05-03 14:04:00 +03:00 |
|
|
|
ca1217ed67
|
nginx: fixed config
|
2023-05-03 12:34:33 +03:00 |
|
|
|
58467b162e
|
nginx: added X-Forwarded-Ssl
|
2023-05-02 16:52:09 +03:00 |
|
Viktor Fomin
|
ecd7fe0e06
|
Web: add deeplink in config
|
2023-05-02 13:17:52 +03:00 |
|
|
|
6ac74189bd
|
nginx: supported cloudfront-forwarded-proto header
|
2023-04-28 16:13:50 +03:00 |
|
|
|
abac508138
|
ApiSystem: fix config
|
2023-04-27 17:42:34 +03:00 |
|
Viktor Fomin
|
09f3de7154
|
Web: fix legalterms url
|
2023-04-26 13:42:29 +03:00 |
|
|
|
e2ab3e391f
|
nginx: refactoring
|
2023-04-24 16:22:21 +03:00 |
|
|
|
84328fc0f3
|
Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137
|
2023-04-24 12:54:44 +03:00 |
|
|
|
6384035e0f
|
fix Bug 62218
|
2023-04-21 13:28:38 +03:00 |
|
|
|
51c3a3cac1
|
nginx: support XFF, XFH, XHP headers
|
2023-04-20 18:18:52 +03:00 |
|
|
|
0123128b50
|
setup ForwardedHeadersOptions via config
|
2023-04-20 18:15:48 +03:00 |
|
|
|
eded2ac313
|
fix Bug 62137
|
2023-04-18 14:17:51 +03:00 |
|
|
|
4dc64cccad
|
fix Bug 62112
|
2023-04-15 17:09:27 +03:00 |
|
|
|
c0bcc09493
|
migrate and fix urlShortener
random generate short link
|
2023-04-14 17:41:15 +03:00 |
|
|
|
18bf4167f7
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 13:27:58 +04:00 |
|
|
|
a471455c8a
|
AppSettings: api-system, api-cache empty settings
|
2023-04-10 21:20:58 +03:00 |
|
|
|
2a736e7c64
|
Settings: legalterms
|
2023-04-10 19:10:30 +03:00 |
|
|
|
d4833bacbf
|
fix
|
2023-04-10 17:28:20 +03:00 |
|
|
|
df62b3862f
|
Merge branch 'release/v1.0.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
|
2023-04-10 17:24:09 +03:00 |
|
|
|
7b1101b50c
|
add "documentation-email" in config
|
2023-04-07 14:18:22 +03:00 |
|
|
|
8eda72fa7b
|
Removed unused providers
|
2023-04-06 18:45:09 +03:00 |
|
|
|
675778cc2d
|
empty "zendesk-key"
|
2023-04-04 17:44:43 +03:00 |
|
|
|
3e2de4cb75
|
add ZendeskKey and BookTrainingEmail in SettingsDto
|
2023-04-04 13:20:59 +03:00 |
|
|
|
87234ea2bf
|
Merge pull request #1314 from ONLYOFFICE/features/formats
Features/formats
|
2023-03-30 13:09:48 +05:00 |
|
|
|
cab3582bcf
|
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
Bugfix/notification image format
|
2023-03-24 12:39:32 +03:00 |
|
|
|
ff38a3535e
|
fix Bug 61709
|
2023-03-23 16:28:18 +03:00 |
|
Vashchuk Nikita
|
ca6e1d1553
|
returned old images
|
2023-03-23 02:26:07 +05:00 |
|
|
|
6a2b6fc46c
|
fix Bug 61731
|
2023-03-22 21:10:01 +03:00 |
|
|
|
422e0bf3f2
|
formats for editor(pr 1305)
|
2023-03-21 12:42:09 +03:00 |
|
|
|
997b966013
|
formats for editor (pr 1302)
|
2023-03-21 12:41:50 +03:00 |
|
|
|
d073a3795c
|
thumbnails: added setup resize mode
|
2023-03-16 18:59:46 +03:00 |
|
|
|
785a04f4fe
|
Applied new height of thumbnails (300 -> 156) + new 1280x720 variant for InfoPanel and preview
|
2023-03-15 19:25:01 +04:00 |
|
|
|
f771315c7c
|
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
backup chunk-size
|
2023-03-15 11:58:32 +03:00 |
|
|
|
2ff1ba77a3
|
filehandler: added preview images
|
2023-03-13 20:11:15 +03:00 |
|
|
|
92539449c4
|
backup chunk-size
|
2023-03-09 15:34:47 +03:00 |
|
|
|
66035a7552
|
Merge remote-tracking branch 'origin/release/v1.0.0' into feature/nginx-location-to-filehandler
|
2023-03-09 13:59:00 +03:00 |
|
Sergey Kirichenko
|
71bb2f70ae
|
Add helthchecks ui web page (#1293)
* Add feature to get page with healthchechks ui
* Add healthchecks config to nginx
* Fix config nginx
|
2023-03-09 14:05:49 +05:00 |
|
|
|
0895fa8020
|
revert chunk size to 10MB
|
2023-03-06 18:39:57 +03:00 |
|
|
|
694a8b3925
|
nginx location to filehandler.ashx
|
2023-03-06 13:14:04 +03:00 |
|
|
|
4292df49a0
|
Merge pull request #1237 from ONLYOFFICE/feature/new-dbname
Feature/new dbname
|
2023-02-22 17:36:45 +03:00 |
|
|
|
ceb614d115
|
Merge pull request #1238 from ONLYOFFICE/feature/default-jwt
Enable AuthorizationJwt by default
|
2023-02-22 17:29:01 +03:00 |
|
|
|
a9960f0545
|
Merge pull request #1170 from ONLYOFFICE/bugfix/chunk-size
fix chunk size
|
2023-02-22 15:30:57 +03:00 |
|
|
|
d0a7926406
|
Enable AuthorizationJwt by default
|
2023-02-22 14:18:36 +03:00 |
|
|
|
4c10b3344e
|
dbname renamed to docspace
|
2023-02-22 13:12:29 +03:00 |
|
|
|
0a5d19a8f4
|
nlog: refactoring. added tenant info when httpcontext exist
|
2023-02-20 23:13:18 +03:00 |
|
|
|
f52f32a6af
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
|
2023-02-07 17:07:20 +03:00 |
|
|
|
85b20c6f72
|
fix chunk size when copy file in s3
|
2023-02-06 14:06:09 +03:00 |
|
|
|
b87d5f0687
|
nginx: fixed cache_control header
|
2023-02-02 22:20:55 +03:00 |
|
|
|
961b0ad613
|
Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned
|
2023-02-02 17:46:41 +03:00 |
|
Timofey Boyko
|
0dc3228702
|
Add cache for locales files
|
2023-02-02 17:27:00 +03:00 |
|
Timofey Boyko
|
c0f7335c7c
|
Change nginx config for work with asset emit
|
2023-02-02 15:17:25 +03:00 |
|
|
|
ca926a912a
|
nginx: added cache for thumbnails
|
2023-02-01 20:47:43 +03:00 |
|
|
|
1d07d0fa12
|
nginx: change cache-control header value
|
2023-02-01 13:27:45 +03:00 |
|
sk81.biz@gmail.com
|
0ef62895f4
|
Delete cache control rool for personal
|
2023-02-01 11:11:24 +03:00 |
|
sk81.biz@gmail.com
|
9e215c04fc
|
del no-transform
|
2023-01-31 21:37:21 +03:00 |
|
sk81.biz@gmail.com
|
49d0b172b1
|
del immutable, modify max-age for locales
|
2023-01-31 21:30:01 +03:00 |
|
sk81.biz@gmail.com
|
214350c43f
|
Modify nginx cache control
|
2023-01-31 15:00:02 +03:00 |
|
sk81.biz@gmail.com
|
ca0996ce3f
|
Modify cache
|
2023-01-31 14:50:49 +03:00 |
|
sk81.biz@gmail.com
|
ad770ac01c
|
Modify cache-control
|
2023-01-31 14:40:06 +03:00 |
|
sk81.biz@gmail.com
|
4278213d03
|
Modify Cache Control ngix
|
2023-01-31 10:57:05 +03:00 |
|
Elyor Djalilov
|
418bc2d3c3
|
Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters.
|
2023-01-27 15:56:07 +05:00 |
|
|
|
0105f7fadc
|
fix
|
2023-01-27 12:08:30 +03:00 |
|
sk81.biz@gmail.com
|
8c9b032ae6
|
Modify cache control in nginx
|
2023-01-25 19:21:03 +03:00 |
|
|
|
406ee9f2f9
|
Notify: removed schedulers. Fixed send
|
2023-01-19 23:13:29 +03:00 |
|
Timofey Boyko
|
873c5400e1
|
Fixed Bug 60231 - Desktop: Unable to connect desktop client to DocSpace portal
|
2023-01-17 19:28:39 +03:00 |
|
Timofey Boyko
|
23fb021e9d
|
Web: fix nginx config for open desktop editors
|
2023-01-17 17:42:00 +03:00 |
|
|
|
070475af5b
|
running ActivePassiveHostedService in singletone mode as default
|
2023-01-11 00:31:12 +03:00 |
|
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
|
226bb41eb7
|
Update apisystem.json - remove "api-cache"
|
2023-01-10 14:40:00 +03:00 |
|
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|
|
|
553a2a7843
|
fixed nginx config
|
2022-12-26 20:29:34 +03:00 |
|
|
|
8167b9d26c
|
storage logo fixed cach
|
2022-12-26 20:09:11 +03:00 |
|
|
|
186662fad7
|
change value "api-cache"
|
2022-12-26 10:41:08 +03:00 |
|
|
|
b25dbdf123
|
improved user/room logo images load
|
2022-12-23 17:08:06 +03:00 |
|
|
|
f687c16a6b
|
fixed StorageHandler class
|
2022-12-22 18:48:30 +03:00 |
|
|
|
ceebd5b47d
|
refactoring
|
2022-12-22 18:48:05 +03:00 |
|
|
|
e47d45c7fd
|
Merge branch 'release/rc-v1.2.0' into feature/cache-fix
|
2022-12-22 16:17:06 +03:00 |
|
|
|
1aeac87cef
|
add apicache in config
|
2022-12-21 12:25:08 +03:00 |
|
|
|
045d61c0bf
|
add bat for asc.apicache
|
2022-12-20 13:04:21 +03:00 |
|
|
|
40ea7aefeb
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-20 12:47:44 +03:00 |
|
|
|
579a050625
|
config: Added .svg to "viewed-images" array.
|
2022-12-16 19:03:56 +03:00 |
|
|
|
db951d00e6
|
asc.apicache
|
2022-12-16 15:41:09 +03:00 |
|
|
|
4c29cede49
|
fixed cache bugs
|
2022-12-14 16:26:13 +03:00 |
|
|
|
fd20a8e803
|
added cache *.woff2 files
|
2022-12-13 19:42:47 +03:00 |
|
|
|
1f5351c4cf
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-12 19:34:08 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
5e2d50aa7c
|
fixed upload url
|
2022-12-12 19:07:30 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
Vashchuk Nikita
|
38857366e1
|
Bug 59715 - Studio: Users. Аватарки пользователей не кешируются браузером
|
2022-12-12 14:09:29 +05:00 |
|
|
|
fb3af4d1c0
|
Build: Docker: fix run api-system
|
2022-12-09 16:37:19 +03:00 |
|
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
|
8dac43b756
|
Files: removed products/files/httphandlers
|
2022-12-08 13:24:57 +03:00 |
|
|
|
a03b50bd7c
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 16:20:29 +03:00 |
|
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
Viktor Fomin
|
15ff7aa19d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-06 16:50:55 +03:00 |
|
Timofey Boyko
|
0ca58b19fe
|
Add nginx location for open docspace at desktop editors
|
2022-12-06 15:57:19 +03:00 |
|
|
|
a44d24d86f
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-30 16:24:04 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
|
baedfcc93a
|
fixed performance issue
|
2022-11-29 16:47:26 +03:00 |
|
|
|
b9f45035b9
|
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
|
2022-11-29 13:07:12 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
Sergey Kirichenko
|
dfa948d5b3
|
Delete docker services (#1081)
|
2022-11-24 17:47:27 +03:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
|
|
ff5272dee3
|
Config: Added blank appsettings.dev.json for docker containers
|
2022-11-22 12:05:39 +03:00 |
|
Vlada Gazizova
|
f3d9aa918d
|
Web:Formatted appsettings.json.
|
2022-11-21 16:22:59 +03:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
|
29d52e6d06
|
Web:Change themelimit.
|
2022-11-21 11:04:19 +03:00 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
