IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0

Browse Source
This commit is contained in:
Tatiana Lopaeva 2022-12-07 11:38:47 +03:00
commit d2538e677e
6 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/pages/Home/Section/Filter/index.js
View File

@ -891,7 +891,6 @@ const SectionFilterContent = ({
label: "",
withOptions: true,
options: [
{ key: FilterKeys.withSubfolders, label: t("WithSubfolders") },
{
id: "filter_folders_with-subfolders",
key: FilterKeys.withSubfolders,

1
packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
View File

@ -125,6 +125,7 @@ const DNSSettings = (props) => {
<div className="category-item-heading">
<div className="category-item-title">{t("DNSSettings")}</div>
<HelpButton
offsetRight={0}
iconName="static/images/combined.shape.svg"
size={12}
tooltipContent={tooltipDNSSettingsTooltip}

1
packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
View File

@ -495,6 +495,7 @@ class LanguageAndTimeZone extends React.Component {
{t("StudioTimeLanguageSettings")}
</div>
<HelpButton
offsetRight={0}
iconName="static/images/combined.shape.svg"
size={12}
tooltipContent={tooltipLanguageTimeSettings}

1
packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
View File

@ -263,6 +263,7 @@ const PortalRenaming = (props) => {
<div className="category-item-heading">
<div className="category-item-title">{t("PortalRenaming")}</div>
<HelpButton
offsetRight={0}
iconName="static/images/combined.shape.svg"
size={12}
tooltipContent={tooltipPortalRenamingTooltip}

1
packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
View File

@ -318,6 +318,7 @@ class WelcomePageSettings extends React.Component {
{t("CustomTitlesWelcome")}
</div>
<HelpButton
offsetRight={0}
iconName="static/images/combined.shape.svg"
size={12}
tooltipContent={tooltipCustomTitlesTooltip}

3
packages/client/src/pages/Profile/Section/Footer/index.js
View File

@ -54,7 +54,7 @@ const ActiveSessions = ({
setCurrentSession(res.loginEvent);
});
}, []);
const onClickRemoveAllSessions = async () => {
try {
setLoading(true);
@ -126,6 +126,7 @@ const ActiveSessions = ({
{t("Profile:LogoutAllActiveSessions")}
</Link>
<HelpButton
offsetRight={0}
iconName="/static/images/info.react.svg"
tooltipContent={
<Text fontSize="13px">