|
|
3170833b98
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.macos.code-workspace
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# yarn.lock
|
2023-11-09 19:13:20 +05:00 |
|
|
|
e914bcd9a6
|
Fix circle dependencies components-common
|
2023-11-07 11:55:11 +04:00 |
|
|
|
e82feda91b
|
Removed useless auto-chanelog for debug-info
|
2023-11-01 11:07:50 +04:00 |
|
|
|
884213d3e1
|
Styled DebugInfo dialog
|
2023-10-28 15:46:26 +04:00 |
|
DmitrySychugov
|
fd250c57da
|
Merge branch 'develop' into feature/management
# Conflicts:
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/components/context-menu/index.js
# yarn.lock
|
2023-10-25 14:40:50 +05:00 |
|
|
|
fece0dc003
|
Update yarn.lock
|
2023-10-18 18:23:37 +04:00 |
|
DmitrySychugov
|
887ed64df0
|
fixed bad merge
|
2023-10-04 20:41:41 +05:00 |
|
|
|
2abd950e73
|
Update yarn.lock
|
2023-10-03 19:47:07 +04:00 |
|
|
|
4db819e7fb
|
Update yarn.lock
|
2023-09-28 11:25:40 +04:00 |
|
|
|
d762d746fa
|
Update yarn.lock
|
2023-09-25 16:27:28 +04:00 |
|
|
|
326c8903c5
|
Update yarn.lock
|
2023-09-21 18:11:32 +04:00 |
|
|
|
c42072eb9e
|
Update yarn.lock
|
2023-09-15 19:16:55 +04:00 |
|
Akmal Isomadinov
|
58e0603cda
|
Web: Added webpack bundle analyzer
|
2023-09-12 18:31:31 +05:00 |
|
Akmal Isomadinov
|
28035d391e
|
Web:Components Added i18n in storybook and fixed keys
|
2023-09-11 18:31:06 +05:00 |
|
|
|
21fd5aa9d5
|
Merge branch 'develop' into feature/cron
|
2023-09-11 12:34:41 +04:00 |
|
|
|
b022c41772
|
Update yarn.lock
|
2023-09-08 11:33:45 +04:00 |
|
Akmal Isomadinov
|
8dca5302af
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-07 18:46:47 +05:00 |
|
Akmal Isomadinov
|
2ba6366f29
|
Merge branch 'develop' into feature/cron
|
2023-09-07 16:43:58 +05:00 |
|
Akmal Isomadinov
|
6f8f34468c
|
Web: Updated tooltip
|
2023-09-05 14:14:37 +05:00 |
|
|
|
d96e45abb7
|
Update yarn.lock
|
2023-09-05 12:08:32 +04:00 |
|
|
|
fa345cded2
|
Update yarn.lock
|
2023-09-01 22:23:35 +04:00 |
|
|
|
d77e8a1771
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 16:42:08 +02:00 |
|
|
|
c5b03c8aeb
|
Web: Login: Added captcha.
|
2023-08-31 15:39:57 +03:00 |
|
|
|
2ced4328df
|
Web: updated react-i18next to v13
|
2023-08-30 15:08:56 +04:00 |
|
Akmal Isomadinov
|
9b1f7d3f8e
|
Web:Added luxon library
|
2023-08-17 12:28:00 +05:00 |
|
|
|
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 |
|
|
|
6bb5c28a9f
|
Update yarn.lock
|
2023-08-09 12:28:12 +04:00 |
|
|
|
92d8e97021
|
Update yarn.lock
|
2023-08-07 12:26:45 +04:00 |
|
|
|
c8f06c967c
|
Merge pull request #1514 from ONLYOFFICE/feature/rtl-interface-direction
Feature/rtl interface direction
|
2023-08-04 17:28:00 +03:00 |
|
|
|
8ba1099358
|
Web: Optimize fonts import
|
2023-08-03 21:54:09 +04:00 |
|
|
|
c4f386e0d0
|
Update yarn.lock
|
2023-08-02 18:07:19 +04:00 |
|
|
|
08dc00bae5
|
Update yarn.lock
|
2023-08-02 12:52:27 +04:00 |
|
Subhonbek
|
982d2f41ec
|
Merge branch 'develop' into feature/rtl-interface-direction
|
2023-08-01 16:19:35 +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 |
|
|
|
841a274e9f
|
Update yarn.lock
|
2023-07-27 15:36:50 +04:00 |
|
|
|
8990e5c07f
|
Update yarn.lock
|
2023-07-26 11:10:25 +04:00 |
|
|
|
cd41c8387b
|
Fix scrollbar conflicts after merge
|
2023-07-25 14:03:41 +02:00 |
|
|
|
ee56dc8ffb
|
Update yarn.lock
|
2023-07-25 13:21:17 +04:00 |
|
|
|
a1db7d19eb
|
Update yarn.lock
|
2023-07-20 11:40:31 +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 |
|
|
|
594af06531
|
Update yarn.lock
|
2023-07-07 18:41:31 +04:00 |
|
|
|
181ddd4d4b
|
Merge pull request #1486 from ONLYOFFICE/bugfix/storybook
Bugfix/storybook
|
2023-06-30 11:52:41 +04:00 |
|
Vladimir Khvan
|
45f671275e
|
storybook-addon-design was added
|
2023-06-26 18:18:00 +05:00 |
|
|
|
fbe25546ed
|
Update yarn lock
|
2023-06-26 15:51:00 +03:00 |
|
Vladimir Khvan
|
57fb011aac
|
storybook was upgraded
|
2023-06-26 12:34:10 +05:00 |
|
Vladimir Khvan
|
9bd9f2e115
|
Merge branch 'develop' into bugfix/storybook
|
2023-06-23 12:54:56 +05:00 |
|
Vladimir Khvan
|
56b7bd5d02
|
storybook-dark-theme addon was added
|
2023-06-21 16:12:16 +05:00 |
|
|
|
5b895b8f6e
|
Update yarn.lock
|
2023-06-16 13:29:07 +04:00 |
|
Vladimir Khvan
|
cde6a6701a
|
dev dependencies for storybook were added
|
2023-06-15 13:49:47 +05:00 |
|
|
|
5ee14090cc
|
Web: fix upload call stack hell
|
2023-06-14 20:55:15 +04:00 |
|
Timofey Boyko
|
53a3e34651
|
Update yarn.lock
|
2023-06-13 10:48:44 +03:00 |
|
|
|
0f717612c0
|
Update yarn.lock
|
2023-06-13 11:44:47 +04:00 |
|
Timofey Boyko
|
7abc9641e1
|
Merge branch 'develop' into branch feature/move-to-selector
|
2023-06-13 10:42:49 +03:00 |
|
|
|
e9adcbdaa4
|
Update yarn.lock
|
2023-06-09 15:10:51 +04:00 |
|
Timofey Boyko
|
2c9fe42444
|
Web:Components: fix typescript warnings
|
2023-06-08 15:56:10 +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 |
|
|
|
d474f2059b
|
Update yarn.lock
|
2023-06-02 13:32:39 +04:00 |
|
|
|
2dae5a3a4a
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-06-02 13:16:21 +04:00 |
|
|
|
d076b53a4c
|
Update yarn.lock
|
2023-06-02 12:14:57 +04:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
DmitrySychugov
|
bf93681c3f
|
Web: Components: update yarn lock
|
2023-05-26 19:58:09 +05:00 |
|
|
|
c0f1eff14c
|
Update yarn.lock
|
2023-05-26 18:39:19 +04:00 |
|
DmitrySychugov
|
4dbb891af8
|
Web: Components: update storybook
|
2023-05-22 14:59:13 +05:00 |
|
|
|
2ea55e968c
|
Update yarn.lock
|
2023-05-17 18:36:26 +04:00 |
|
|
|
d95425bcc4
|
Update yarn.lock
|
2023-05-12 12:39:13 +04:00 |
|
DmitrySychugov
|
6758f61cb1
|
Web: Components: fixed typescript error, added required plugins
|
2023-05-04 20:06:20 +05:00 |
|
DmitrySychugov
|
1ebc34c0f9
|
Web: installed new dependencies after migrating to new storybook version
|
2023-05-02 16:21:14 +05:00 |
|
|
|
5860dcbdf9
|
Update yarn.lock
|
2023-04-25 14:32:58 +04:00 |
|
|
|
65737a6031
|
Update yarn.lock
|
2023-04-20 19:32:10 +04:00 |
|
Timofey Boyko
|
8f1f0bd543
|
Web: move navigate and location from SettingsStore to window.DocSpace
|
2023-04-20 17:53:49 +03:00 |
|
Timofey Boyko
|
a039670fed
|
Merge branch 'develop' into feature/routing-optimization
|
2023-04-20 17:29:35 +03:00 |
|
Timofey Boyko
|
8347b3cf0d
|
Web:Client: add new package @loadable/component
|
2023-04-20 17:25:57 +03:00 |
|
|
|
b1f869759e
|
Update yarn.lock
|
2023-04-20 12:31:53 +04:00 |
|
Timofey Boyko
|
77756918ac
|
Web: fix routing after wizard
|
2023-04-14 16:42:36 +03:00 |
|
Timofey Boyko
|
474937a412
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-14 10:54:27 +03:00 |
|
|
|
2caababd60
|
Update yarn.lock
|
2023-04-13 13:30:55 +04:00 |
|
|
|
ad2a6980f5
|
Update yarn.lock
|
2023-04-11 22:17:43 +04:00 |
|
|
|
f34672cb25
|
Update yarn.lock
|
2023-04-11 12:52:09 +04:00 |
|
Timofey Boyko
|
199f17e5dc
|
Web: update react-router
|
2023-04-10 10:13:06 +03:00 |
|
Timofey Boyko
|
be1c870618
|
Web: update react-router-dom and react-router to v6
|
2023-04-06 15:38:57 +03:00 |
|
Timofey Boyko
|
edeee9f90a
|
Web:Client: pass history to router
|
2023-04-05 10:40:47 +03:00 |
|
|
|
efd4d39ec1
|
Update yarn.lock
|
2023-03-30 23:11:59 +04:00 |
|
Timofey Boyko
|
f3f150b6f0
|
Web: remove react-resize-detector
|
2023-03-30 16:54:20 +03:00 |
|
Timofey Boyko
|
801db0393f
|
revert 6bfbec9334
|
2023-03-29 14:32:54 +03:00 |
|
Timofey Boyko
|
6bfbec9334
|
Update styled-components to beta version
|
2023-03-29 11:50:30 +03:00 |
|
|
|
52583879f3
|
Update yarn.lock
|
2023-03-27 22:43:27 +04:00 |
|
|
|
a7e951ee1f
|
Update yarn.lock
|
2023-03-24 19:19:27 +04:00 |
|
|
|
4390389163
|
Upgrade dependencies
|
2023-03-23 19:55:49 +04:00 |
|
|
|
04f745d530
|
Merge pull request #1300 from ONLYOFFICE/dependabot/npm_and_yarn/webpack-5.76.0
Bump webpack from 5.52.1 to 5.76.0
|
2023-03-16 18:44:27 +04:00 |
|
|
|
49a1649ffb
|
Update yarn.lock
|
2023-03-16 13:56:11 +04:00 |
|
|
|
32e60d2d07
|
Merge branch 'develop' into feature/webhooks-ui
|
2023-03-16 13:56:02 +04:00 |
|
|
|
ee825c6f94
|
Web: Upgrade @onlyoffice/document-editor-react to v1.3.0
|
2023-03-15 12:45:53 +04:00 |
|
dependabot[bot]
|
f79fb953e9
|
Bump webpack from 5.52.1 to 5.76.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.52.1 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.52.1...v5.76.0)
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-03-14 17:27:56 +00:00 |
|
DmitrySychugov
|
11070b266c
|
Web: update yarn lock
|
2023-03-13 16:58:43 +05:00 |
|
|
|
913b931544
|
Merge branch 'develop' into feature/webhooks-ui
|
2023-03-06 11:21:00 +04:00 |
|
Viktor Fomin
|
64484eaa29
|
Editor: xss protection
|
2023-02-27 12:23:12 +03:00 |
|
Viktor Fomin
|
1914cfd98f
|
Fix Bug 61352: login xss
|
2023-02-24 23:47:36 +03:00 |
|
Vladimir Khvan
|
245a148ec3
|
broken yarn file was changed
|
2023-02-13 15:45:36 +05:00 |
|
Vladimir Khvan
|
c86238b344
|
Merge branch 'feature/webhooks-ui' of github.com:ONLYOFFICE/DocSpace into feature/webhooks-ui
|
2023-02-10 16:11:30 +05:00 |
|
Vladimir Khvan
|
d9a40a7296
|
yarn file was updated
|
2023-02-10 16:07:34 +05:00 |
|
|
|
e8e7cb8d93
|
Update yarn.lock
|
2023-02-09 13:29:40 +03:00 |
|
|
|
ac5e19398d
|
Merge branch 'develop' into feature/selection-area
# Conflicts:
# yarn.lock
|
2023-02-08 16:28:08 +03:00 |
|
Viktor Fomin
|
358f9ea1d3
|
Merge branch 'develop' into bugifx/wizard
|
2023-02-08 12:48:55 +03:00 |
|
Timofey Boyko
|
eb5d6b9b77
|
Plugins: bump dependencies
|
2023-02-08 10:21:42 +03:00 |
|
|
|
86d93f1259
|
Merge branch 'develop' into feature/selection-area
# Conflicts:
# yarn.lock
|
2023-02-07 17:04:43 +03:00 |
|
Viktor Fomin
|
7ac9a9ed54
|
Merge branch 'develop' into bugifx/wizard
|
2023-02-07 14:44:48 +03:00 |
|
|
|
0dd6985bd2
|
Fixed storybook run
|
2023-02-07 12:57:48 +03:00 |
|
Viktor Fomin
|
1328cb2691
|
Merge branch 'release/rc-v1.2.0' into bugifx/wizard
|
2023-02-07 00:47:41 +03:00 |
|
Elyor Djalilov
|
0bfb980f99
|
Bug 61043 - Files. Unreadable characters instead of name in Author column and Info/History panel
|
2023-02-06 21:19:25 +05:00 |
|
Viktor Fomin
|
075374c43a
|
Merge branch 'release/rc-v1.2.0' into bugifx/wizard
|
2023-02-06 13:52:41 +03:00 |
|
Timofey Boyko
|
ca973c0002
|
Merge branch 'bugfix/ssr-translations' of https://github.com/ONLYOFFICE/DocSpace into bugfix/ssr-translations
|
2023-02-06 11:32:10 +03:00 |
|
Timofey Boyko
|
6137e2a122
|
Web: remove before-build-webpack-plugin and apply custom plugin for create autoGeneratedTranlsations files
|
2023-02-06 11:32:02 +03:00 |
|
|
|
fb74ebe991
|
Update yarn.lock
|
2023-02-03 20:14:18 +03:00 |
|
Timofey Boyko
|
0b7b214fbb
|
Web: change prebuild-webpack-plugin for before-build-webpack-plugin
|
2023-02-03 18:52:51 +03:00 |
|
Viktor Fomin
|
38608bb394
|
Merge branch 'release/rc-v1.2.0' into bugifx/wizard
|
2023-02-02 23:27:55 +03:00 |
|
Elyor Djalilov
|
65ac7c9405
|
add autoGeneratedTranslations
|
2023-02-02 20:59:16 +05:00 |
|
Viktor Fomin
|
42feb5475a
|
Client: Wizard: fix timezone select
|
2023-02-02 13:22:16 +03:00 |
|
Timofey Boyko
|
531e265e73
|
Web:Login: add prebuild-webpack-plugin
|
2023-02-01 16:04:41 +03:00 |
|
Timofey Boyko
|
26e3008b8c
|
Web:Client: add prebuild-webpack-plugin
|
2023-02-01 12:39:44 +03:00 |
|
|
|
e2427b9fbb
|
Update yarn.lock
|
2023-01-30 12:24:42 +03:00 |
|
|
|
425fc7531e
|
Merge branch 'release/rc-v1.2.0' into feature/selection-area
# Conflicts:
# yarn.lock
|
2023-01-27 13:45:27 +03:00 |
|
|
|
718edfc780
|
Update yarn.lock
|
2023-01-24 20:36:36 +03:00 |
|
Timofey Boyko
|
f4cb8acf1d
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-18 18:06:22 +03:00 |
|
Akmal Isomadinov
|
daeff04225
|
Web:Component Added @react-spring/web package and animated rotate
|
2023-01-17 13:45:20 +05:00 |
|
Timofey Boyko
|
7b4a78b6c3
|
Web:Components: add webpack 5 for storybook
|
2023-01-16 12:58:35 +03:00 |
|
Akmal Isomadinov
|
af8cfa37e3
|
Web: Added sub component mobile viewer, added package @use-gesture/react and refactoring
|
2023-01-16 12:17:14 +05:00 |
|
|
|
9ead11f7c7
|
Web: updated yarn.lock
|
2023-01-09 14:01:45 +03:00 |
|
|
|
b3a5a5fdf6
|
Merge branch 'develop' into feature/selection-area
# Conflicts:
# packages/client/src/pages/Home/index.js
# packages/client/src/store/FilesStore.js
# packages/common/components/Section/index.js
# packages/components/selector/StyledSelector.js
# packages/components/selector/index.js
# yarn.lock
|
2023-01-09 13:51:00 +03:00 |
|
Timofey Boyko
|
96d3458e2d
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-09 11:03:08 +03:00 |
|
DmitrySychugov
|
f2b47785ee
|
Web: remove react-swipeable library
|
2022-12-28 21:15:05 +05:00 |
|
|
|
43c5954543
|
Update yarn.lock
|
2022-12-27 18:06:22 +03:00 |
|
DmitrySychugov
|
a37f5914d7
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2022-12-27 16:47:10 +05:00 |
|
DmitrySychugov
|
89a6fb6283
|
Merge branch 'develop' into feature/new-viewer
|
2022-12-27 15:08:15 +05:00 |
|
|
|
99a940dc0f
|
Update yarn.lock
|
2022-12-26 20:27:20 +03:00 |
|
|
|
89d01ae718
|
Web: upgraded axios version from 0.21.4 to 0.22.0
|
2022-12-26 16:57:51 +03:00 |
|
|
|
b72cf10ccf
|
Web: Client: Changed deploy statics (added loaders)
|
2022-12-09 10:33:03 +03:00 |
|
|
|
ad2a28c109
|
Update yarn.lock
|
2022-12-05 18:50:01 +03:00 |
|
DmitrySychugov
|
7275b1811a
|
Merge branch 'develop' into feature/new-viewer
|
2022-11-29 19:10:11 +05:00 |
|
|
|
ba26f496b6
|
Update yarn.lock
|
2022-11-22 22:36:33 +03:00 |
|
|
|
304f47adaf
|
Merge branch 'feature/custom-theme' of github.com:ONLYOFFICE/AppServer into feature/custom-theme
|
2022-11-21 15:51:35 +03:00 |
|
|
|
c5e54cae1f
|
Web:Move dependency to client package.
|
2022-11-21 14:00:31 +03:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
|
31db809bd0
|
Update yarn.lock
|
2022-11-17 20:24:11 +03:00 |
|
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
Viktor Fomin
|
9cca8532c3
|
Merge branch 'develop' into bugfix/login
|
2022-11-16 19:58:03 +05:00 |
|
Viktor Fomin
|
09796e8ec4
|
Web: fix serve
|
2022-11-16 19:55:46 +05:00 |
|
|
|
e50833f7f3
|
common settings for configure aws cloudwatch credentials
|
2022-11-16 12:44:53 +03:00 |
|
|
|
bea44696d1
|
Merge branch 'develop' into feature/new-viewer
|
2022-11-14 20:05:25 +05:00 |
|
|
|
2d56118667
|
Web: install react-swipeable
|
2022-11-14 17:25:14 +05:00 |
|
