|
|
cd8900b6f5
|
Web: Commented log
|
2023-08-07 12:56:09 +04:00 |
|
Viktor Fomin
|
a484ad73d5
|
Editor: fix theme
|
2023-08-05 23:23:09 +03:00 |
|
Viktor Fomin
|
8b6282f2ee
|
Editor: fix for empty config
|
2023-08-04 19:04:16 +03:00 |
|
|
|
638807a0e0
|
Merge branch 'develop' into feature/deep-link
|
2023-08-04 19:01:14 +04:00 |
|
|
|
12558b8520
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# yarn.lock
|
2023-08-01 17:56:22 +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 |
|
|
|
30c4e4bbaa
|
Web: bump version to v1.1.2
|
2023-07-28 21:03:52 +04:00 |
|
|
|
f4e2f76fff
|
Web: Editor: fixed goBack
|
2023-07-25 18:27:43 +03:00 |
|
|
|
f3765018f1
|
Web: bump version
|
2023-07-25 14:02:50 +04: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 |
|
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 |
|
|
|
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
|
cc7dd8c743
|
Editor: add support color scheme
|
2023-07-17 14:20:18 +03:00 |
|
Viktor Fomin
|
0919efed87
|
Editor: get deeplink info from api
|
2023-07-17 14:13:31 +03:00 |
|
Viktor Fomin
|
78b6c43d74
|
Merge branch 'develop' into feature/deep-link
|
2023-07-17 13:24:15 +03:00 |
|
|
|
a86408fcf8
|
Web: Client: SDK: Added editorGoBack property for editor
|
2023-07-14 16:57:58 +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 |
|
|
|
6b7d6c14eb
|
Fixed Bug 63232 - Rooms. Fixed user rights
|
2023-07-04 16:26:46 +03:00 |
|
|
|
aefa938903
|
Fix bug 12345 - Web:Editor: No message in editor saying file is locked by another user after exiting version history.
|
2023-07-04 13:52:35 +03:00 |
|
|
|
9ec36f8633
|
Web:Client:FilesSelector: fix with new filter
|
2023-06-27 17:41:12 +03:00 |
|
|
|
4c0e68ad3d
|
Web:Client:FilesSelector: add available selec files
|
2023-06-26 15:50:49 +03:00 |
|
Timofey Boyko
|
a83b100f4e
|
Web:Client: update SelectFolderDialog for editor
|
2023-06-22 15:59:20 +03:00 |
|
|
|
12b0ef8672
|
Bump version to 1.1.0
|
2023-06-02 13:32:32 +04:00 |
|
|
|
6473e6a684
|
Web: Files: fixed opening documents for public user
|
2023-05-31 16:41:24 +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 |
|
|
|
e9fb560511
|
Web: Editor: Fix display list of protected users
|
2023-05-25 13:36:39 +04:00 |
|
|
|
e9a26b813c
|
Web: Editor: Fix setup usersInRoom
|
2023-05-25 12:59:06 +04:00 |
|
|
|
47dc8b63fc
|
Web: Editor: Added new API method getProtectUsers
|
2023-05-22 22:42:13 +04:00 |
|
|
|
589830e208
|
Fix Bug 62625 - [DocSpace] Desktop: Document is created when creating a new table/presentation
|
2023-05-17 19:48:06 +04:00 |
|
|
|
a3ead0bf8c
|
Fix Bug 61063 - Desktop: File opens in a browser tab when opened in an application connected to the DocSpace portal
|
2023-05-12 12:40:15 +04:00 |
|
Viktor Fomin
|
4c686bbc5e
|
Fix Bug 62357: Interface theme is not transferred to editors
|
2023-04-29 14:25:20 +03:00 |
|
Viktor Fomin
|
14fcd1d739
|
Editor: get color scheme
|
2023-04-25 20:49:09 +03:00 |
|
|
|
615cc4e183
|
Bump version to v1.0.1
|
2023-04-25 14:32:55 +04:00 |
|
Viktor Fomin
|
24bce866cd
|
Editor: DeepLink: use translate
|
2023-04-24 14:04:59 +03:00 |
|
Viktor Fomin
|
cc2084c388
|
Merge branch 'develop' into feature/deep-link
|
2023-04-24 10:36:16 +03:00 |
|
|
|
f5d3372af2
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-24 11:33:58 +04:00 |
|
Viktor Fomin
|
b4ee00c41f
|
Editor: use translation
|
2023-04-24 10:24:36 +03:00 |
|
Viktor Fomin
|
fcdb6fe313
|
Editor: add translation
|
2023-04-24 10:24:30 +03:00 |
|
Viktor Fomin
|
a231770283
|
Editor: init dark theme for deeplink
|
2023-04-21 15:19:22 +03:00 |
|
Viktor Fomin
|
c2cf76cfd6
|
Editor: add redirect if app is default
|
2023-04-21 14:39:28 +03:00 |
|
Viktor Fomin
|
336eeeabb9
|
Editor: init stay in browser
|
2023-04-21 14:25:00 +03:00 |
|
Viktor Fomin
|
6af9813196
|
Editor: init open deeplink in app
|
2023-04-21 13:50:30 +03:00 |
|
|
|
a97351f4ae
|
Editor: Fix favicon on oform/docxf and other files without documentType
|
2023-04-21 14:34:43 +04:00 |
|
Viktor Fomin
|
2bea864aeb
|
Editor: fix show deeplink
|
2023-04-21 13:30:08 +03:00 |
|
Viktor Fomin
|
f9f456747f
|
Editor: DeepLink: get logo
|
2023-04-20 16:11:37 +03:00 |
|
Viktor Fomin
|
33b11fcba7
|
Editor: init deeplink page
|
2023-04-20 16:11:26 +03:00 |
|
Viktor Fomin
|
99a41592ee
|
Editor: DeepLink: get file info
|
2023-04-20 15:06:59 +03:00 |
|
Viktor Fomin
|
2fa7f356b5
|
Editor: DeepLink: add remember logic
|
2023-04-20 14:57:18 +03:00 |
|
Viktor Fomin
|
361f45f339
|
Editor: Components: init deeplink layout
|
2023-04-20 13:31:03 +03:00 |
|
