Commit Graph

3834 Commits

Author SHA1 Message Date
df8228ff01 fix s3 backup tar 2023-07-19 00:19:27 +03:00
43c7b85a14 logger: used only nlog logger provider. 2023-07-18 20:08:55 +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
8578868a62 Merge branch 'develop' into feature/backup-s3-tar 2023-07-18 16:22:02 +03:00
162b3cf36d first version: backup s3 tar 2023-07-18 16:21:44 +03:00
615df7a72c Radicale: check radicale available 2023-07-15 12:03:59 +03:00
9b32618dd2 added translations 2023-07-14 16:01:54 +03:00
fcd56a9764 fix Bug 63301 2023-07-13 21:58:11 +03:00
057bccb801 added translations 2023-07-13 18:20:52 +03:00
96586b0aa0 Merge branch 'develop' into feature/public-room-backend 2023-07-13 13:45:08 +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
a42d2f8b6c
Merge pull request #1515 from ONLYOFFICE/bugfix/webhooks
Bugfix/webhooks
2023-07-12 19:34:49 +04: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
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
ab592bb7c9 People: added IsRoomAdmin field 2023-07-12 00:50:47 +03:00
812010a8af added translations 2023-07-11 18:22:23 +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
3e18110da9 added translations 2023-07-10 18:16:31 +03:00
d231ad2577 fix DbWorker 2023-07-10 10:53:53 +03:00
cb805f59c1 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-07 14:32:02 +03:00
62e6431605 added translations 2023-07-07 14:31:42 +03:00
a0efa6c115 SocketIO: added user and password support for redis 2023-07-07 14:14:22 +03:00
91fc1f0c04 ASC.Core.Common: DbUserService: fixed ObjectDisposedException 2023-07-07 12:56:09 +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
4d0c17d396
Merge pull request #1507 from ONLYOFFICE/feature/tenantcookie
Feature/tenantcookie
2023-07-05 06:53:01 +04:00
e634285b97 fix Bug 63003 2023-07-05 00:03:44 +03:00
a6954a3764 added translations 2023-07-04 18:07:50 +03:00
506544ea7c Merge branch 'release/v1.1.0' into feature/tenantcookie 2023-07-04 13:12:09 +04:00
220a21fe4f fixed quota 2023-07-03 20:07:00 +03:00
cfe7c589f6 fixed quota 2023-07-03 19:39:35 +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
89a609dd5e Merge branch 'develop' into feature/ipsecurity-fixes 2023-07-03 13:22:25 +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
3889e95c63 TenantCookieSettings: check enabled 2023-07-03 12:53:51 +03:00
6921f945bc Build: Refactoring publish with profiles 2023-07-03 12:28:03 +04:00
2c540aed25 Publish: Added publish profiles for Unix 2023-07-03 00:53:29 +04: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
0ff6e98473 TenantCookieSettings: lifetime is now 1440 by default. added "default" property 2023-06-30 19:07:18 +03:00
1d3534ab46 fixed query 2023-06-30 14:57:19 +03:00
2b1295455c fix 2023-06-30 14:35:08 +03:00
20300337f3 fix query 2023-06-30 12:41:20 +03:00
164792e924 fix query 2023-06-30 12:22:37 +03:00
6b4517b5dc Fix bug 63112 2023-06-29 19:04:20 +03:00
870d4efac5 added translations 2023-06-29 18:06:36 +03:00
c0f3860ee9 Billing: affiliateId to shopping link 2023-06-29 14:16:26 +05:00
d6e3d3c3ba ASC.Data.Reassigns: ReassignProgressItem: progress change 2023-06-29 11:47:43 +03:00
dff3333862 fix query 2023-06-29 11:32:05 +03:00
c4692c0e69 fixed query 2023-06-28 20:17:22 +03:00
9845542023 fix 2023-06-28 20:10:44 +03:00
23889afe39 fix 2023-06-28 18:07:50 +03:00
4f1a68d440 ASC.Data.Reassigns: ReassignProgressItem: run ReassignStorage method 2023-06-28 16:14:30 +03:00
bce52a2549 fixed query 2023-06-28 13:52:14 +03:00
c505c8dc2b added translations 2023-06-28 13:35:40 +03:00
13d5d61cad ASC.IPSecurity: ip restriction range can't start with dash or slash 2023-06-28 10:52:21 +03:00
7e543a07bf ASC.IPSecurity: optimization 2023-06-28 10:48:56 +03:00
879d190234 ASC.IPSecurity: fix for check CIDR restrictions with IPv6 addresses 2023-06-28 10:44:08 +03:00
cba8f62d8f ASC.IPSecurity: fixed mapping after rename "tenant" to "tenantid" 4a1e1a88e7 2023-06-28 10:40:33 +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
c0a1608691 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-27 16:43:58 +03:00
3ba27cd577 added translations 2023-06-27 16:42:20 +03:00
254771a43a Core: Security: fixed validation 2023-06-27 14:17:46 +03:00
116d4c8174
Merge pull request #1491 from ONLYOFFICE/bugfix/fix-migration-namespaces
Bugfix/fix migration namespaces
2023-06-27 02:37:30 -07:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
265335d371 fix 2023-06-26 11:33:37 +03:00
01bbf1fb5e rename migration.core to migrations.core 2023-06-26 11:12:57 +03:00
7c7e20dfa3 fix migration namespace 2023-06-25 02:15:36 +03:00
0f571bf31b added translations 2023-06-23 18:11:24 +03:00
706394ee7f fix 63006 2023-06-22 18:19:15 +03:00
30233cd8c4 added translations 2023-06-22 18:09:30 +03:00
1bcdcd4f46 migrations for standalone 2023-06-21 21:11:18 +03:00
09ffbbba7e create migration context 2023-06-21 15:40:55 +03:00
28055fc876 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-21 10:54:57 +03:00
fc311ef24f fix 62906, 62999 2023-06-20 17:12:10 +03:00
67eac48247 fix migration 2023-06-19 16:31:56 +03:00
221c28b532 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-19 14:39:05 +03:00
3d694ad5ae Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Webhooks.Core/EF/Model/WebhooksLog.cs
#	web/ASC.Web.Studio/GlobalUsings.cs
#	web/ASC.Web.Studio/Startup.cs
2023-06-19 11:46:35 +03:00
f79d996709 fixed fatal error from logs 2023-06-16 15:07:39 +03:00
b5b865236b added translations 2023-06-16 13:54:38 +03:00
9d425e0f8f nlog: CustomExceptionFilterAttribute change LogError => LogCritical 2023-06-15 19:03:00 +03:00
a1235de616 nlog: DebugRemoteIpAddress => TraceRemoteIpAddress 2023-06-15 18:49:45 +03:00
10a63e5908 telegram: removed deprecated dll 2023-06-15 16:57:16 +03:00
d03e4ef330 nlog: fixed LoggerMiddleware 2023-06-15 16:56:11 +03:00
a5ee8e3824 nlog: update dll 2023-06-15 16:55:43 +03:00
84444d89a1 added UnhandledExceptionMiddleware 2023-06-15 16:54:15 +03:00
f12e821ba4 nlog: log fatal error 2023-06-15 16:53:43 +03:00
e3681c243f ASC.Common: replace deprecated .dll 2023-06-14 15:56:11 +03:00
3f191d928a added logger 2023-06-14 15:03:07 +03:00
6e07ad70f4 refactoring 2023-06-14 11:47:11 +03:00
0198f88c64 EF: added substring db function, refactoring 2023-06-14 11:45:40 +03:00
a3bcd0a099 fixed 62906 2023-06-13 00:39:02 +03:00
6491f137e5 fixed 61957 2023-06-13 00:08:10 +03:00
baa18cab8b fixed 62955 2023-06-12 23:54:10 +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
ba345c0f06 fix merge 2023-06-09 14:04:55 +03:00
5cdb23bc5d added translations 2023-06-09 10:56:28 +03:00
fef76e032f added translations 2023-06-08 18:24:46 +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
7ba5cc975b Webhooks: fixed migrations 2023-06-07 21:23:38 +03:00
65d2343c65 added translations 2023-06-07 17:40:23 +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
6888fdbd51 added translations 2023-06-06 18:47:15 +03:00
75a83f3253 Now setting "CanIndexByContent" is always true 2023-06-06 18:27:40 +03:00
f9b979c89c Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-06 14:27:00 +03:00
d62949de40 Firebase: added FirebaseDbContext to pool 2023-06-06 14:26:30 +03:00
71d0dce908 fix Bug 62879 2023-06-06 11:49:37 +03:00
f4f5edec05 Merge branch 'develop' into feature/webhooks-page
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
2023-06-06 01:49:14 +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
6dd4adc79d Files: HttpRequestExtensions: added Request-Token header 2023-06-01 18:13:27 +03:00
9b456a71ae fix 2023-06-01 15:59:17 +03:00
746962bc06 Merge branch 'develop' into features/security-elasticsearch 2023-06-01 15:45:31 +03:00
1f9ec5087b fix 2023-06-01 14:30:20 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
15ea9521c1 refactoring 2023-06-01 14:01:21 +03:00
c44e162162 fix ClearEventsService 2023-06-01 13:58:52 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
eaa733b7fa CompileAsyncQuery: TelegramDao 2023-05-31 18:03:36 +03:00
869519758a CompileAsyncQuery: TariffService 2023-05-31 17:07:09 +03:00
Vladimir Khvan
7619fe03e8 Merge branch 'develop' into feature/webhooks-page 2023-05-31 16:05:47 +05:00
6d01b26ca5 redis: bugfixed 2023-05-31 13:13:26 +03:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
ea23868aea fix 2023-05-31 11:28:33 +03:00
cac224c022 fix 2023-05-31 11:19:00 +03:00
743a8a363c ApiSystem: removed region support 2023-05-31 11:01:17 +03:00
9a3f0278a3 CompileAsyncQuery: RegisterInstanceDao 2023-05-31 10:55:03 +03:00
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
dbbebc8c4b CompileAsyncQuery: ProviderAccountDao 2023-05-30 22:23:11 +03:00
ea70be9ba7 redis: force raise cache notify 2023-05-30 19:32:27 +03:00
a246b02c2c distributedTaskQueue: fixed unused subscription 2023-05-30 19:31:16 +03:00
78c9a7713a CompileAsyncQuery: PortalControllerHelper 2023-05-30 16:21:52 +03:00
e557a73b36 CompileAsyncQuery NotifyCleanerService 2023-05-30 16:17:05 +03:00
98fb5838b9 CompileAsyncQuery: MobileAppInstallRegistrator 2023-05-30 15:56:07 +03:00
720fff1455 CompileAsyncQuery: IPRestrictionsRepository 2023-05-30 15:50:17 +03:00
645afb959f CompileAsyncQuery: InvitationLinkHelper 2023-05-30 15:42:15 +03:00
d7100426de CompileAsyncQuery: IntegrationEventLogService 2023-05-30 15:39:28 +03:00
b99f5e24f3 CompileAsyncQuery: FirebaseDao 2023-05-30 14:15:20 +03:00
6c78438b75 Merge branch 'develop' into feature/optimization-ef
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
2023-05-30 14:13:02 +03:00
c0547f5887 DistributedTaskQueue: fixed removing orphan tasks 2023-05-30 13:16:12 +03:00
7724669c7e fix ef Find 2023-05-30 12:36:46 +03:00
01c3b6e2a1 fixed accepting overdue licence 2023-05-30 11:38:38 +03:00
e5359fad09 fix 2023-05-30 11:26:25 +03:00
9eeec5cc10 CompileAsyncQuery: FeedReadedDataProvider 2023-05-30 11:06:18 +03:00
3d7ef0ef5a CompileAsyncQuery: FeedAggregateDataProvider 2023-05-29 23:26:14 +03:00
5120181799
Merge pull request #1446 from ONLYOFFICE/feature/standalone
Feature/standalone
2023-05-29 18:28:34 +04:00
92d92905c4 CompileAsyncQuery:DbWorker 2023-05-29 16:58:15 +03:00
20320a8fb1 CompileAsyncQuery:DbWorker 2023-05-29 15:01:13 +03:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
f364696ae2 CompileAsyncQuery: DbUserService 2023-05-29 12:48:09 +03:00
845aaa085f Quota: cache by region 2023-05-27 19:44:29 +03:00
5c2fb03209 fix 2023-05-26 18:44:27 +03:00
9dc458e64d CompileAsyncQuery: DbTenantService 2023-05-26 17:41:44 +03:00
8360f77177 Merge branch 'feature/optimization-ef' into feature/optimization-queries 2023-05-26 15:09:33 +03:00
dc6b076ea8 fix 2023-05-26 14:06:44 +03:00
8d088c30ce remove internal methods 2023-05-26 13:45:41 +03:00
d1b384da2c Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-26 12:45:13 +04:00
ce2bc4cb54 CompileAsyncQuery: DbSettingsManager 2023-05-26 11:24:58 +03:00
18d04bf45a fix 2023-05-25 18:24:26 +03:00
2a1c97bf2a CompileAsyncQuery: DbSettingsManager 2023-05-25 17:53:05 +03:00
b217384437 CompileAsyncQuery: DbRadicale 2023-05-25 17:36:01 +03:00
659eb22801 CompileAsyncQuery: DbQuotaService 2023-05-25 17:06:24 +03:00
fa17019f70 CompileAsyncQuery: DbLoginEventsManager 2023-05-25 16:29:51 +03:00
71de2c94e7 CompileAsyncQuery: DbHelper 2023-05-25 16:09:43 +03:00
23171528ef CompileAsyncQuery: DbAzService 2023-05-25 15:58:21 +03:00
f39b300a2e CompileAsyncQuery: BaseIndexer 2023-05-25 12:51:55 +03:00
d42eb8e4d2 CompileAsyncQuery: BackupRepository 2023-05-25 12:28:31 +03:00
f0c320f3b0 CompileAsyncQuery: BackupPortalTask 2023-05-25 11:25:58 +03:00
bf8bd3a0ef CompileAsyncQuery: AuditEventsRepository 2023-05-25 11:19:03 +03:00
2a15974880 CompileAsyncQuery: AccountLinker 2023-05-25 10:58:09 +03:00
ef7795f2df Backup: fixed payment after restore 2023-05-24 19:33:10 +03:00
48b580f1b0 added translations 2023-05-24 18:25:14 +03:00
4e0c388d8b Core: added support of empty payment configuration 2023-05-24 18:10:17 +03:00
76db809e3b fix 2023-05-24 17:39:00 +03:00
d78a777a9d fix 2023-05-24 17:16:41 +03:00
7fb137ace1 valueTask instend of Task Internal 2023-05-24 12:40:59 +03:00
f34cab4bf3 remove wait 2023-05-24 10:15:16 +03:00
94388c0616 Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-23 17:00:12 +03:00
395faf8121 fixed Bug 62708 2023-05-23 15:02:01 +03:00
NikitaVashchuk
d1eeb6263c removed uri size limit for webhook config 2023-05-22 16:10:15 +05:00
2f96868672 fix 2023-05-21 18:59:22 +03:00
d7cee576a0 fix async 2023-05-21 00:48:08 +03:00
fab1e08cc5 fix GetOldEventsAsync 2023-05-21 00:34:05 +03:00
e1bbd9a389 fix GetOldEventsAsync 2023-05-21 00:28:04 +03:00
76e80de7be fix ElasticSearchService- ReIndex 2023-05-21 00:23:44 +03:00
fd3f479f7f IResourceFilter to IAsyncResourceFilter 2023-05-21 00:09:11 +03:00
8f1e35b818 added translations 2023-05-19 17:23:00 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
5cc7d38737 fix 2023-05-18 19:26:23 +03:00
819c6597f4 added translations 2023-05-18 18:23:26 +03:00