|
|
e531654c54
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.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/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-08-11 12:47:44 +03:00 |
|
|
|
f8c74d12bd
|
added translations
|
2023-08-03 18:27:59 +03:00 |
|
|
|
a46a82180c
|
Web: Renamed translation
|
2023-07-26 18:56:07 +04:00 |
|
|
|
a67f301608
|
Web: Files: fixed translations
|
2023-07-25 19:04:28 +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 |
|
|
|
a2ddfb54f1
|
Web: Files: added LINKS_LIMIT_COUNT, fixed bugs
|
2023-07-19 16:43:21 +03:00 |
|
|
|
17be338ccf
|
Web: Files: fixed empty links context-menu
|
2023-07-19 15:24:05 +03:00 |
|
|
|
e15b111e36
|
Web: Files: fixed LinkDeletedSuccessfully translation
|
2023-07-19 13:11: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 |
|
|
|
76a9126d4e
|
Web: Files: Public-room: added "Limit by time period" block
|
2023-07-18 15:21:19 +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 |
|
|
|
bcaa84d175
|
Web: Files: added restore public-room translation
|
2023-07-13 13:09:11 +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 |
|
|
|
694bae6d1b
|
added translations
|
2023-07-12 18:20:42 +03:00 |
|
|
|
9eab04b96a
|
added translations
|
2023-07-11 19:14:08 +03:00 |
|
|
|
47314b61c5
|
added translations
|
2023-07-11 18:32:19 +03:00 |
|
|
|
812010a8af
|
added translations
|
2023-07-11 18:22:23 +03:00 |
|
|
|
9973f89e8b
|
Web: Client: PortalSettings: Added "Api information" page
|
2023-07-11 14:53:52 +03:00 |
|
|
|
10ddb99d11
|
Web: Client: PortalSettings: Added "Integration request" block
|
2023-07-10 23:58:58 +03:00 |
|
|
|
4f161741c4
|
Merge pull request #1513 from ONLYOFFICE/feature/tooltip-descriptions
feature/tooltip-descriptions
|
2023-07-10 21:14:11 +04:00 |
|
|
|
29dfa9b79f
|
Update Settings.json
|
2023-07-10 21:07:37 +04:00 |
|
|
|
075235c4f5
|
Update Settings.json
|
2023-07-10 21:03:46 +04:00 |
|
|
|
f0d1521817
|
Web: Fix translations
|
2023-07-10 21:02:45 +04:00 |
|
|
|
75b88d4ecc
|
Update Settings.json
|
2023-07-10 20:53:17 +04:00 |
|
|
|
3e18110da9
|
added translations
|
2023-07-10 18:16:31 +03:00 |
|
Elyor Djalilov
|
35f778e103
|
Web: Client: PortalSettings: removed incorrect translates
|
2023-07-10 19:22:21 +05:00 |
|
Elyor Djalilov
|
51c3eb4ce3
|
Web: Client: PortalSettings: replaced tag strong to index in locales
|
2023-07-10 18:06:11 +05:00 |
|
Elyor Djalilov
|
a206e52d12
|
Web: Client: PortalSettings: fix different formatting
|
2023-07-10 14:54:54 +05:00 |
|
|
|
5fb08b11e8
|
Web: Files: Public-room: added expiration date
|
2023-07-10 10:48:17 +03:00 |
|
|
|
fe2978d87e
|
Merge branch 'release/v1.1.0' into feature/tooltip-descriptions
|
2023-07-07 18:44:36 +04:00 |
|
|
|
57a9eee283
|
added translations
|
2023-07-07 16:36:50 +03:00 |
|
|
|
bf718fc5d7
|
Web: Client: Locales: Added new keys for JavascriptSdk
|
2023-07-07 12:37:02 +03:00 |
|
|
|
6961d14394
|
Web: Files: Public-room: added archive view
|
2023-07-07 12:29:14 +03:00 |
|
|
|
2e14572fc0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
# public/images/clock.react.svg
|
2023-07-07 10:35:33 +03:00 |
|
Elyor Djalilov
|
fb3ad7eabe
|
Web: Client: PortalSettings: fix tfa tooltip description
|
2023-07-05 22:52:43 +05:00 |
|
|
|
31cd81ff7b
|
Merge branch 'release/v1.1.0' into feature/tooltip-descriptions
|
2023-07-05 19:12:36 +04:00 |
|
Elyor Djalilov
|
452fb75686
|
Web: Client: PortalSettings: changed tooltip descriptions
|
2023-07-05 14:55:17 +05:00 |
|
|
|
c078d756ce
|
Web: Client: Locales: Added new keys for JavascriptSdk
|
2023-07-04 18:05:20 +03:00 |
|
|
|
2f79b3baae
|
added translations
|
2023-06-30 13:40:20 +03:00 |
|
|
|
870d4efac5
|
added translations
|
2023-06-29 18:06:36 +03:00 |
|
|
|
c505c8dc2b
|
added translations
|
2023-06-28 13:35:40 +03:00 |
|
|
|
b3f8f26aaa
|
edited variables
|
2023-06-27 16:48:56 +03:00 |
|
|
|
3ba27cd577
|
added translations
|
2023-06-27 16:42:20 +03:00 |
|
|
|
90004e8f94
|
added translations
|
2023-06-27 10:42:38 +03:00 |
|
|
|
c737c5838f
|
added translations
|
2023-06-26 16:02:13 +03:00 |
|
|
|
c29439c1aa
|
added translations
|
2023-06-22 14:06:48 +03:00 |
|
