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
..
Data	code cleanup	2022-04-14 22:42:15 +03:00
Modules	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00
BackupFileInfo.cs	added new license headers	2022-03-15 21:00:53 +03:00
BackupPortalTask.cs	writer.WriteEntry outside ActionInvoker.Try	2023-04-07 17:57:56 +03:00
ColumnMapper.cs	code cleanup	2022-04-14 22:42:15 +03:00
DbFactory.cs	asc.apicache	2022-12-16 15:41:09 +03:00
DeletePortalTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
KeyHelper.cs	migration personal: first version backup	2022-08-10 12:25:53 +03:00
PortalTaskBase.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
RestoreDbModuleTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
RestorePortalTask.cs	add column removed in backup_backup	2023-01-27 18:12:02 +03:00
TransferPortalTask.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00