IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,295 Commits 40 Branches 22 Tags 420 MiB
0cd6daf159
Commit Graph

602 Commits

Author SHA1 Message Date
Ilya Oleshko
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
Alexey Safronov
30c4e4bbaa Web: bump version to v1.1.2 2023-07-28 21:03:52 +04:00
Alexey Safronov
f3765018f1 Web: bump version 2023-07-25 14:02:50 +04:00
Viktor Fomin
09a50c84a5 Merge branch 'develop' into feature/deep-link 2023-07-25 12:54:36 +03:00
Alexey Safronov
92194e786b Node: Services: Added new logLevel param 2023-07-24 14:03:52 +04:00
Ilya Oleshko
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
78b6c43d74 Merge branch 'develop' into feature/deep-link 2023-07-17 13:24:15 +03:00
Alexey Safronov
13d5d1b99f Web: Login: Applied new settings key "cookieSettingsEnabled" 2023-07-04 18:45:24 +04:00
Maria-Sukhova
2f79b3baae added translations 2023-06-30 13:40:20 +03:00
Maria-Sukhova
870d4efac5 added translations 2023-06-29 18:06:36 +03:00
Maria-Sukhova
c505c8dc2b added translations 2023-06-28 13:35:40 +03:00
Maria-Sukhova
3ba27cd577 added translations 2023-06-27 16:42:20 +03:00
Maria-Sukhova
c737c5838f added translations 2023-06-26 16:02:13 +03:00
Maria-Sukhova
c29439c1aa added translations 2023-06-22 14:06:48 +03:00
Maria-Sukhova
6858287810 added translations 2023-06-21 18:41:09 +03:00
Maria-Sukhova
05386e4d0d added translations 2023-06-20 16:10:41 +03:00
Maria-Sukhova
286dfc3138 added translations 2023-06-15 18:17:31 +03:00
Maria-Sukhova
fef76e032f added translations 2023-06-08 18:24:46 +03:00
Maria-Sukhova
e2358abf63 added el 2023-06-06 18:50:06 +03:00
Alexey Safronov
12b0ef8672 Bump version to 1.1.0 2023-06-02 13:32:32 +04:00
DmitrySychugov
1105568509 Merge branch 'develop' into feature/storybook-update 2023-05-31 18:20:37 +05:00
Ilya Oleshko
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
DmitrySychugov
1c257bc3bc Merge branch 'develop' into feature/storybook-update 2023-05-26 19:46:23 +05:00
gazizova-vlada
ae5b3667ac Web:Moved LoginContainer to a separate file. 2023-05-25 12:00:05 +03:00
gazizova-vlada
bb9b2f8c90 Web:Login:Replacing import "@docspace/common/components/ColorTheme" with "@docspace/components/ColorTheme". 2023-05-24 19:45:57 +03:00
DmitrySychugov
462d0eb3b5 Web: renamed code input callback function 2023-05-16 18:57:09 +05:00
Viktor Fomin
e3bc603f9d Fix Bug 62511: Uninformative error when session time expires 2023-05-16 15:53:40 +03:00
Alexey Safronov
db1bcf5fc3 Fix UselessModuleTranslationKeysTest issue (key: Authorization) 2023-05-15 15:35:09 +04:00
Viktor Fomin
05b70bd749 Login: fix NotFoundKeysTest 2023-05-10 11:23:39 +03:00
Viktor Fomin
85d47987db Login: add types 2023-05-05 12:42:57 +03:00
Viktor Fomin
c914c82590 Login: fix UselessTranslationKeysTest 2023-05-05 12:42:31 +03:00
Viktor Fomin
11b10e1602 Login: add translates 2023-04-27 13:39:08 +03:00
Viktor Fomin
c05f8aabe8 Login: rename translate file 2023-04-27 13:38:55 +03:00
Viktor Fomin
a625e3869a Login: show sso errors 2023-04-27 12:21:05 +03:00
Viktor Fomin
2089774190 Login: add translates 2023-04-27 12:20:36 +03:00
Viktor Fomin
8033b2a519 Login: fix style 2023-04-25 21:15:46 +03:00
Alexey Safronov
615cc4e183 Bump version to v1.0.1 2023-04-25 14:32:55 +04:00
Viktor Fomin
c971980434 Login: fix t key 2023-04-24 14:04:08 +03:00
Viktor Fomin
e749307818 Web: move locales Login > Common 2023-04-24 14:03:35 +03:00
Alexey Safronov
48f9073302 Merge branch 'release/v1.0.0' into develop 2023-04-20 12:31:46 +04:00
Ilya Sobolev
97cd9824e1 Add translations (vi) 2023-04-19 16:32:38 +03:00
Viktor Fomin
2800c8a625 Login: ready toast translate 2023-04-18 10:31:21 +03:00
Timofey Boyko
1300df6333 Merge branch 'develop' into feature/react-router-6 2023-04-17 10:42:19 +03:00
Alexey Safronov
100bddeb4a Merge branch 'release/v1.0.0' into develop 2023-04-17 11:38:48 +04:00
Viktor Fomin
4f7e9f8fdd Login: fix more label color 2023-04-14 12:58:45 +03:00
Timofey Boyko
474937a412 Merge branch 'develop' into branch feature/react-router-6 2023-04-14 10:54:27 +03:00
Alexey Bannov
1bfe27bd7a Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-13 17:41:38 +03:00
Alexey Bannov
7e5c048415 logger: configure logStreamName in aws logger target on startup 2023-04-13 17:41:23 +03:00
Alexey Safronov
5fcd3e166b Merge branch 'release/v1.0.0' into develop 2023-04-13 16:44:51 +04:00
Alexey Safronov
edc28f5d9b Web: Login: Added redirect to /wizard 2023-04-13 16:43:53 +04:00
Alexey Safronov
18bf4167f7 Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00
Timofey Boyko
e6f1969879 Merge branch 'develop' into branch feature/react-router-6 2023-04-12 13:56:41 +03:00
Maria-Sukhova
d0a4bff865 added translations 2023-04-11 17:12:13 +03:00
pavelbannov
df62b3862f Merge branch 'release/v1.0.0' into develop 
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/components/scrollbar/custom-scrollbars-virtual-list.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Helpers/Global.cs
 2023-04-10 17:24:09 +03:00
Ilya
debf275864 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-10 15:35:23 +03:00
Ilya
ee49a99dde Update translations: bg, el, lo, pt 2023-04-10 15:35:14 +03:00
Timofey Boyko
75cff9e01f Web: change useMatch to useParams or delete useless code 2023-04-10 15:20:28 +03:00
Alexey Safronov
d84c3d3a0a Fix NotTranslatedToastsTest issue 2023-04-10 15:25:40 +04:00
Timofey Boyko
809929f18b Web: fix confirm pages 2023-04-07 17:54:49 +03:00
Timofey Boyko
8d6f0880ad Web: change history to navigate/location 2023-04-07 12:51:10 +03:00
Timofey Boyko
8b2ecd4a51 Web:Login:Server: fix import StaticRouter 2023-04-07 12:37:46 +03:00
svetlana maleeva
91489a069c Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-06 17:48:26 +03:00
svetlana maleeva
dcca9fda56 Add translations 2023-04-06 17:48:09 +03:00
Timofey Boyko
6ab66f3849 Web: change Switch to Routes 2023-04-06 16:37:01 +03:00
Alexey Safronov
e27306570f
Merge pull request #1331 from ONLYOFFICE/feature/health-route 
Feature/health route
 2023-04-06 13:58:57 +04:00
Ilya
84d1a9a899 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 
# Conflicts:
#	packages/client/public/locales/pl/DeleteDialog.json
#	packages/client/public/locales/ro/Payments.json
#	packages/client/public/locales/ro/Translations.json
 2023-04-05 17:44:00 +03:00
Ilya
48e011ea19 Add translations: nl, pl, ro, sk, tr 2023-04-05 17:37:15 +03:00
Maria-Sukhova
746826fcce Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-05 17:03:38 +03:00
Maria-Sukhova
0c4d1f8810 added translations 2023-04-05 17:03:14 +03:00
gopienkonikita
597e047320 Web: Login: added health route 2023-04-05 14:41:38 +03:00
Viktor Fomin
d301a3e8dd Login: fix tooltip position 2023-04-05 14:31:36 +03:00
svetlana maleeva
99d13d36f6 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 
# Conflicts:
#	packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
 2023-04-03 18:41:02 +03:00
svetlana maleeva
0153e1964a Add translations 2023-04-03 18:37:53 +03:00
Maria-Sukhova
65cd469c4a added translations 2023-04-03 18:09:00 +03:00
Viktor Fomin
772ccc78bc Login: hide social networks if oAuth disabled 2023-03-29 17:02:59 +03:00
Viktor Fomin
2441664aa4 Login: fix oauth redirect 2023-03-29 11:32:16 +03:00
Maria-Sukhova
d44706498d added translations 2023-03-28 18:43:17 +03:00
Alexey Safronov
4a0a86efb1 Merge branch 'develop' into feature/react-18 2023-03-24 17:01:00 +04:00
Alexey Safronov
57e168642c Merge branch 'release/v1.0.0' into develop 2023-03-24 16:59:33 +04:00
Viktor Fomin
84f837055e Login: added typing 2023-03-24 13:19:31 +03:00
Maria-Sukhova
53311f0e36 added translations 2023-03-23 19:05:25 +03:00
Alexey Safronov
a0810ad718 Web: Applied changes to new React v18 2023-03-23 19:56:23 +04:00
Alexey Safronov
4390389163 Upgrade dependencies 2023-03-23 19:55:49 +04:00
Alexey Safronov
11065de511 Merge branch 'release/v1.0.0' into develop 2023-03-23 18:04:41 +04:00
Viktor Fomin
9e7dd6a828 Login: fix for trusted domains 2023-03-23 14:47:28 +03:00
Viktor Fomin
f23827c0e0 Login: use toast for confirmed email 2023-03-21 14:40:34 +03:00
Viktor Fomin
0aec51aa3a Login: disable select 2023-03-20 13:34:57 +03:00
Viktor Fomin
bdef497cad Login: fix type 2023-03-17 15:18:50 +03:00
Viktor Fomin
d4c0875892 Login: fix register style 2023-03-17 15:12:47 +03:00
Viktor Fomin
e1e8b2e942 Login: delete useless 2023-03-17 14:14:35 +03:00
Viktor Fomin
6588b02491 Login: delete useless 2023-03-17 14:10:24 +03:00
Alexey Safronov
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
Maria-Sukhova
d017a2e71d Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-15 18:44:11 +03:00
Maria-Sukhova
95734445e3 added new translations 2023-03-15 18:43:28 +03:00
Alexey Safronov
3ee1e53171 Web: Login: fix ERR_HTTP_HEADERS_SENT on first login 2023-03-15 19:34:22 +04:00
Viktor Fomin
a70797f7e2 Fix Bug 61470: authorization loop 2023-03-15 13:54:49 +03:00
Alexey Safronov
9a45dea8bd Web: Added opportunity to change wrongPortalNameUrl in config.json 2023-03-14 22:31:43 +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
Alexey Safronov
4bb0bc9d1c Web: Change version to v1.0.0 2023-03-13 12:19:48 +04:00
Alexey Safronov
83c03823aa Fix confirmLink activeEmail 2023-03-06 12:35:49 +04:00
Ilya Oleshko
05249ddf77 Merge branch 'develop' into feature/browserlist 2023-02-28 13:48:19 +03:00
Ilya Oleshko
0386034439 Added browserDetector at editor and login templates 2023-02-28 13:47:43 +03:00
Viktor Fomin
1914cfd98f Fix Bug 61352: login xss 2023-02-24 23:47:36 +03:00
Viktor Fomin
4bc3ca7101 Login: fix mobile style 2023-02-10 03:04:26 +03:00
Viktor Fomin
3ceda4c395 Login: fix style 2023-02-09 21:26:28 +03:00
Timofey Boyko
698b00eabb Web:Login: refactoring 2023-02-08 11:03:15 +03:00
Timofey Boyko
2bbcf5a03a Web: move wrongPortalNameUrl to common/constants 2023-02-08 10:58:35 +03:00
Timofey Boyko
469455312b Web:Login:Server: delete useless code 2023-02-08 10:58:03 +03:00
Timofey Boyko
ede3a5d21d Web:Login: add mechanism for throwing error from server 2023-02-07 18:36:44 +03:00
Timofey Boyko
1dc5d41884 Web:Login: fix error message type 2023-02-07 18:36:16 +03:00
Timofey Boyko
7e23b7118e Web:Login:Server: add protect for undefined values 2023-02-07 18:32:17 +03:00
Timofey Boyko
88624cccf0 Web:Login:Client: add protect for undefined values 2023-02-07 18:32:02 +03:00
Timofey Boyko
b6ece7b2ac Web:Login: add correct theme for Error502 and pass it to all components inside 2023-02-07 18:26:51 +03:00
Timofey Boyko
03116b8ffa Web:Login: update interfaces and add new IError for error from server 2023-02-07 18:26:05 +03:00
Timofey Boyko
2397482010 Web:Login: add html template to catch section and send error to client 2023-02-07 18:25:37 +03:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +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
Timofey Boyko
ccbe89546f Web:Login: add autoGeneratedTranslations.ts to gitignore file 2023-02-03 19:08:46 +03:00
Timofey Boyko
0b7b214fbb Web: change prebuild-webpack-plugin for before-build-webpack-plugin 2023-02-03 18:52:51 +03:00
Timofey Boyko
d83c9520dc Web:Login: fix 2023-02-03 17:51:44 +03:00
Timofey Boyko
d4314b6601 Web:Login: commit new autoGeneratedTranslations 2023-02-03 17:16:32 +03:00
Timofey Boyko
69c2390895 Web:Login:Client: fix helpers for work with translations files 2023-02-03 17:16:01 +03:00
Timofey Boyko
2502557c58 Web:Login:Server: send only en and current lang locales to client 2023-02-03 17:15:17 +03:00
Timofey Boyko
e8cdfd6213 Web:Login:Server:i18n: import locales as resources 2023-02-03 17:14:54 +03:00
Timofey Boyko
500d1fe09b Web:Login: remove file loader for json file for server 2023-02-03 17:14:20 +03:00
Timofey Boyko
bc3cf59630 Web:Login: add additional path for beforeBuild script 2023-02-03 17:14:02 +03:00
Timofey Boyko
dcb1f29306 Web:Login: add new alias CLIENT_PUBLIC_DIR 2023-02-03 17:13:29 +03:00
Timofey Boyko
7fff409f0f Web:Login:Server: add function for changed currentLanguage to correct currentLanguage 2023-02-03 14:22:08 +03:00
Alexey Safronov
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
Timofey Boyko
9f0d2b62cb Web: fix regexp for json locales 2023-02-02 17:09:26 +03:00
Timofey Boyko
9e67aadbe9 Web: delete useless code 2023-02-02 17:07:41 +03:00
Alexey Safronov
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
4bd1483718 Web:Login:Template: change fonts import 2023-02-02 15:15:17 +03:00
Timofey Boyko
27b7723cb2 Web:Login:Client: delete useless code 2023-02-02 15:14:57 +03:00
Timofey Boyko
9b07ea2b61 Web:Login: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:14:23 +03:00
Timofey Boyko
779cd5f4c8 Web: update regexp for webpack for work with locales files as url 2023-02-01 18:49:17 +03:00
Timofey Boyko
7beb8403cc Web:Login: fix multi create auto generated translations file 2023-02-01 18:43:01 +03:00
Timofey Boyko
57d6925791 Web: update webpack configs for work with auto generated translations file 2023-02-01 18:36:43 +03:00
Timofey Boyko
72e3fe9032 Web: rename translations to autoGeneratedTranslations 2023-02-01 17:53:33 +03:00
Timofey Boyko
2b2b8377c7 Web: add beforeBuild to all modules 2023-02-01 16:06:33 +03:00
Timofey Boyko
531e265e73 Web:Login: add prebuild-webpack-plugin 2023-02-01 16:04:41 +03:00
Timofey Boyko
1dd4f2b42d Web:Login: delete useless code 2023-02-01 11:50:45 +03:00
Timofey Boyko
440e80e9d3 Web:Login:Helpers: fix loadLanguagePath and initI18n functions for work with static locales 2023-02-01 11:45:20 +03:00
Timofey Boyko
a8f550b0c5 Web:Login: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:41:34 +03:00
Timofey Boyko
f56f136e8e Web:Login: fix work with hashed translation 2023-01-31 19:23:36 +03:00
Timofey Boyko
71c14db6df Revert 6bbf8e3a62 2023-01-31 18:56:58 +03:00
Timofey Boyko
713b8b6369 Web:Login: delete useless code 2023-01-31 18:54:13 +03:00
Timofey Boyko
521a1658c6 Web:Editor: disable sw and fix tranlsation hash 2023-01-31 17:10:19 +03:00
Timofey Boyko
f9e09b2299 Web:Login: fix work with hashed translation 2023-01-31 11:27:45 +03:00
Timofey Boyko
17a1ab2152 Web:Login: update webpack config for work with json files as url 2023-01-30 19:18:49 +03:00
Timofey Boyko
6bbf8e3a62 Web: move all Locales from Login and Editor to public dir 2023-01-30 15:11:30 +03:00
Timofey Boyko
d3e28341a7 Web:Login: add PUBLIC_DIR alias 2023-01-27 16:30:33 +03:00
Timofey Boyko
ab7e49b93e Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 16:01:11 +03:00
Timofey Boyko
cfe642a82f Web:Login:Server: disable cache-control 2023-01-27 13:53:34 +03:00
Alexey Safronov
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
Timofey Boyko
76bd31350f Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 11:42:52 +03:00
Alexey Safronov
761a8357dd Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS. 2023-01-26 20:23:50 +03:00
Timofey Boyko
123e25d907 Web:Login: change 'client/' to '/login/' to images 2023-01-26 17:00:17 +03:00
Timofey Boyko
6fbef8ee4d Web:Login: change assets rule 2023-01-26 16:59:53 +03:00
Alexey Safronov
75ef9b68f3 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-24 18:36:09 +03:00
Timofey Boyko
f2a28941ee Web:Login: fix hash url at template 2023-01-24 18:19:13 +03:00
Timofey Boyko
9e5f76d7c0 Web: fix double slash for favicon 2023-01-24 17:37:18 +03:00
Tatiana Lopaeva
7b55fe5a68 Web: Added portal recovery pages to the login page. 2023-01-24 16:19:06 +03:00
Timofey Boyko
ef1d0c0184 Web: change assetModuleFilename rule 2023-01-19 15:37:15 +03:00
Timofey Boyko
aa56742bce Web:Login: fix webpack rules 2023-01-16 17:58:55 +03:00
Timofey Boyko
0cb238e5d3 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-16 10:36:22 +03:00
Viktor Fomin
e71573ba9d Login: useThemeDetector 2023-01-13 22:00:38 +03:00
Timofey Boyko
b46d21c258 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-11 18:47:06 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
Timofey Boyko
2ee7c8e124 Web:Login: fix importan images 2023-01-09 16:41:19 +03:00
Timofey Boyko
96d3458e2d Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-09 11:03:08 +03:00
Maria-Sukhova
6526b1463d edited en 2022-12-30 14:56:53 +03:00
Alexey Safronov
9aad0214a3 Translations: Added rus translations (by Google) 2022-12-28 21:42:28 +03:00
Timofey Boyko
9fc5ce7f23 Web:Login:Client: fix import default logo 2022-12-27 18:20:34 +03:00
Timofey Boyko
c1ee0f7f05 Web:Login: fix webpack rules 2022-12-27 18:19:59 +03:00
Timofey Boyko
774065c165 Web: fix default logo import 2022-12-27 17:04:56 +03:00
Timofey Boyko
205fc24365 Web:Login: add new webpack rules for assets 2022-12-27 16:59:04 +03:00
Viktor Fomin
f9be71a87f Login: use custom favicon 2022-12-27 14:39:26 +03:00
Akmal Isomadinov
c97e59ee67 Web: Fixed cyclic import LoginContainer 2022-12-26 17:45:02 +05:00
Alexey Safronov
e907b3aaf9 Update login.babel and applied sorting 2022-12-23 19:10:19 +03:00
Akmal Isomadinov
c62000f3f5 Web: Fixed redirection after login 2022-12-23 15:56:42 +05:00
Akmal Isomadinov
9f88b7a14f Web:Login Fixed warning useLayoutEffect 2022-12-22 20:48:35 +05:00
Viktor Fomin
04bd4ab927 Login: use useLayoutEffect 2022-12-22 14:56:24 +03:00
Akmal Isomadinov
532f94ba0c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 
# Conflicts:
#	packages/client/src/helpers/confirmRoute.js
 2022-12-22 15:47:55 +05:00
Akmal Isomadinov
e816a72280 Web:Login Fixed invalid link error handler and login/error page 2022-12-22 15:32:11 +05:00
Akmal Isomadinov
0010ca4b5a Web:Login:Locales Updated translations for the login/error page 2022-12-22 15:16:58 +05:00
Alexey Safronov
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
Akmal Isomadinov
2e66174a87 Web Fixed catch 2022-12-16 17:17:30 +05:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
Elyor Djalilov
a1710df2ef unused key removed 2022-11-30 19:26:49 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Viktor Fomin
75bcfdbdd2 Login: SimpleNav: fix logo 2022-11-23 06:18:48 +05:00
Viktor Fomin
85f092aa0d Login: fix logo 2022-11-23 06:18:24 +05:00
Viktor Fomin
2d41cd5a72 Login: fix logo 2022-11-22 12:48:34 +05:00
Alexey Safronov
7415a19a5e Merge branch 'develop' into bugfix/login 2022-11-17 19:05:09 +03:00
SuhorukovAnton
9da275952c fix nconf 2022-11-17 15:58:13 +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
Viktor Fomin
6c3684985f Login: use more login from common 2022-11-16 17:23:31 +05:00
Viktor Fomin
eb22002d64 Login: delete useless 2022-11-16 17:22:58 +05:00
Alexey Bannov
e50833f7f3 common settings for configure aws cloudwatch credentials 2022-11-16 12:44:53 +03:00
Viktor Fomin
5a214cc658 Login: fix style 2022-11-16 00:56:27 +05:00
Viktor Fomin
5a9c9f20d2 Login: fix text color 2022-11-16 00:49:53 +05:00
Viktor Fomin
343d2ee9fd Login: fix 2022-11-16 00:46:18 +05:00
Viktor Fomin
c7e34d63be Login: fix warnings 2022-11-15 19:34:39 +05:00
Viktor Fomin
680679e480 Merge branch 'develop' into bugfix/login 2022-11-15 19:31:42 +05:00
Viktor Fomin
8e2811074f Login: fix style 2022-11-15 15:25:38 +05:00
Viktor Fomin
012aa3bc2c Login: fix style 2022-11-15 15:13:23 +05:00
Viktor Fomin
42f263294e Login: fix enable admin message 2022-11-15 15:13:16 +05:00
Viktor Fomin
ee239756c7 Login: fix 2022-11-15 14:52:37 +05:00
Alexey Safronov
7c0d97361d Merge branch 'develop' into feature/Add-identifier-for-test 2022-11-15 10:38:41 +03:00
Viktor Fomin
5d0f809a4a Login: fix style 2022-11-14 17:25:45 +05:00
Viktor Fomin
a62dbbc49c Login: fix style 2022-11-14 17:21:07 +05:00
Viktor Fomin
d8761eda42 Login: add bg pattern 2022-11-14 17:17:17 +05:00
Viktor Fomin
97f0277449 Merge branch 'develop' into bugfix/login 2022-11-14 17:13:21 +05:00
Viktor Fomin
08c86d8a37 Login: add support ssr theme 2022-11-14 17:13:07 +05:00
Alexey Safronov
7bf47d6251 Fix login connect ECONNREFUSED ::1:8092 2022-11-14 13:48:28 +03:00
Akmal Isomadinov
4c51c6dc55 Web:Login:Client:Components:Login Added id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
7c7ecd210a Web:Login:Client:Components:Sub-Components: Added id for test 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
c790439098 Web:Login:Client:Components:Login: Added id to the RecoverAccessModalDialog 2022-11-14 13:04:17 +05:00
Akmal Isomadinov
e3363c1a84 Web:Login:Client:Components:Sub-Components: Add id to the ForgotPasswordModalDialog component for the test 2022-11-14 13:04:17 +05:00
Akmal Isomadinov
2ab04c6a1d Web:Login:Components:Sub-Components: Add id for forgot password link 2022-11-14 13:04:17 +05:00
Viktor Fomin
92844a82bf Login: add support dark theme 2022-11-13 05:09:14 +05:00
Viktor Fomin
b8df7f8b6a Merge branch 'develop' into bugfix/login 2022-11-13 03:59:57 +05:00
Alexey Safronov
518e10f4ee Added opportunity to start production frontend 2022-11-11 11:28:03 +03:00
Viktor Fomin
f94023403a Login: fix crash 2022-11-11 13:08:49 +05:00
Viktor Fomin
6f1f1e6dc5 Login: fix style 2022-11-11 12:59:27 +05:00
Viktor Fomin
643e9285ce Login: fix line, text colors 2022-11-11 04:41:49 +05:00
Viktor Fomin
8aa148d79e Login: fix padding 2022-11-11 04:16:45 +05:00
Alexey Safronov
19e7742803 Fix ERR_OSSL_EVP_UNSUPPORTED and remove codeceptjs (canvas issue) 2022-11-10 16:46:14 +03:00
Alexey Safronov
dfb1509961 Update more-login.tsx 
Added logging
 2022-11-07 22:43:22 +03:00
Viktor Fomin
8f39246f5e Login: fix 2022-11-01 15:51:51 +05:00
Viktor Fomin
8a77cad5f4 Merge branch 'develop' into feature/whitelabel 2022-10-27 17:13:27 +05:00
Viktor Fomin
e231dafb62 Login: fix help button color 2022-10-27 17:10:39 +05:00
Viktor Fomin
61d8379753 Login: delete useless 2022-10-27 16:05:10 +05:00
Viktor Fomin
80ef93d7f7 Login: use whitelabel logo 2022-10-27 16:04:53 +05:00
Viktor Fomin
10fb8b159b Login: use from common 2022-10-24 15:01:54 +05:00
Viktor Fomin
37ead8c825 Login: add mounted hook 2022-10-24 12:45:00 +05:00
Viktor Fomin
1b0c161b15 Login: fix 2022-10-24 12:16:04 +05:00
Viktor Fomin
8983855bd2 Login: fix template style 2022-10-21 15:32:25 +05:00
Viktor Fomin
29c646c14d Login: wait tReady 2022-10-21 15:16:22 +05:00
Viktor Fomin
e67b10eada Login: fix style 2022-10-21 15:16:08 +05:00
Viktor Fomin
fc10e8731f Login: fix 2022-10-20 20:45:51 +05:00
Viktor Fomin
8f97977da3 Login: fix template style 2022-10-20 20:43:20 +05:00
Viktor Fomin
6c6850ffa2 Login: auto theme 2022-10-20 20:25:28 +05:00
Viktor Fomin
12b3ea476f Login: fix style 2022-10-20 17:57:52 +05:00
Viktor Fomin
e2951f1586 Login: fix style 2022-10-20 17:54:26 +05:00
Viktor Fomin
d2fe1b8e9b Login: fix access for auth user 2022-10-20 15:32:20 +05:00
Viktor Fomin
a3f505f2b6 Login: use theme from store 2022-10-20 14:04:48 +05:00
Viktor Fomin
0e59cf271e Login: add support dark theme 2022-10-20 14:01:20 +05:00