Alexey Safronov 03b03ed910 Merge branch 'develop' into feature/sso ... # Conflicts: # packages/client/public/images/actions.upload.react.svg # packages/client/public/images/empty_screen_privacy.png # packages/client/public/locales/en/SingleSignOn.json # packages/client/public/locales/ru/SingleSignOn.json # packages/client/src/helpers/constants.js # packages/client/src/pages/PortalSettings/categories/integration/index.js # packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js # packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js # packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js # packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js # packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js # packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js # packages/client/src/store/SsoFormStore.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js # web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js		2022-08-02 12:05:15 +03:00
..
About.json
Article.json
ArticlePeople.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
BackupCodesDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ChangeEmailDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ChangeOwnerPanel.json
ChangePasswordDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ChangePhoneDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ChangeUserStatusDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ChangeUserTypeDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
Confirm.json
ConflictResolveDialog.json
ConnectDialog.json
ConvertDialog.json
ConvertPasswordDialog.json
DataLossWarningDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
DeleteDialog.json
DeleteProfileEverDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
DeleteSelfProfileDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
DeleteThirdPartyDialog.json
DeleteUsersDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
DownloadDialog.json
EmbeddingPanel.json
EmptyTrashDialog.json
Errors.json
Files.json
FilesSettings.json
FormGallery.json
GroupAction.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
GroupSelector.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
Home.json
HotkeysPanel.json
InfoPanel.json
InviteDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
NavMenu.json
NewFilesPanel.json
PaymentsEnterprise.json
People.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
PeopleSelector.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
PeopleTranslations.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
PreparationPortal.json	Merge branch 'develop' into refactoring/client	2022-07-28 10:38:29 +03:00
PrivacyPage.json
Profile.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ProfileAction.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
ResetApplicationDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
SelectFile.json	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
SelectFolder.json
SendInviteDialog.json	Web: Moved 'People' images and translations to 'Client'	2022-07-25 10:29:16 +03:00
Settings.json
SharingPanel.json
SmartBanner.json
ThirdPartyMoveDialog.json
ToastHeaders.json
Translations.json
UploadPanel.json
VersionHistory.json
Wizard.json