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
..
files	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
groups	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
modules	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
people	Web: Fix 'Accounts' imports, routes and includes	2022-07-26 12:51:52 +03:00
portal	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
rooms	Web: Upgrade yarn to v3.2.2	2022-07-29 18:20:57 +03:00
settings	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
user	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
client.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00