Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
This commit is contained in:
commit
6a49d562f6
@ -96,6 +96,7 @@ const TfaActivationForm = withLoader((props) => {
|
|||||||
loginWithCodeAndCookie,
|
loginWithCodeAndCookie,
|
||||||
history,
|
history,
|
||||||
location,
|
location,
|
||||||
|
currentColorScheme,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const [code, setCode] = useState("");
|
const [code, setCode] = useState("");
|
||||||
@ -153,15 +154,27 @@ const TfaActivationForm = withLoader((props) => {
|
|||||||
portal security. Configure your authenticator application to
|
portal security. Configure your authenticator application to
|
||||||
continue work on the portal. For example you could use Google
|
continue work on the portal. For example you could use Google
|
||||||
Authenticator for
|
Authenticator for
|
||||||
<Link isHovered href={props.tfaAndroidAppUrl} target="_blank">
|
<Link
|
||||||
|
color={currentColorScheme?.main?.accent}
|
||||||
|
href={props.tfaAndroidAppUrl}
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
Android
|
Android
|
||||||
</Link>
|
</Link>
|
||||||
and{" "}
|
and{" "}
|
||||||
<Link isHovered href={props.tfaIosAppUrl} target="_blank">
|
<Link
|
||||||
|
color={currentColorScheme?.main?.accent}
|
||||||
|
href={props.tfaIosAppUrl}
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
iOS
|
iOS
|
||||||
</Link>{" "}
|
</Link>{" "}
|
||||||
or Authenticator for{" "}
|
or Authenticator for{" "}
|
||||||
<Link isHovered href={props.tfaWinAppUrl} target="_blank">
|
<Link
|
||||||
|
color={currentColorScheme?.main?.accent}
|
||||||
|
href={props.tfaWinAppUrl}
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
Windows Phone
|
Windows Phone
|
||||||
</Link>{" "}
|
</Link>{" "}
|
||||||
.
|
.
|
||||||
@ -286,6 +299,7 @@ export default inject(({ auth, confirm }) => ({
|
|||||||
tfaAndroidAppUrl: auth.tfaStore.tfaAndroidAppUrl,
|
tfaAndroidAppUrl: auth.tfaStore.tfaAndroidAppUrl,
|
||||||
tfaIosAppUrl: auth.tfaStore.tfaIosAppUrl,
|
tfaIosAppUrl: auth.tfaStore.tfaIosAppUrl,
|
||||||
tfaWinAppUrl: auth.tfaStore.tfaWinAppUrl,
|
tfaWinAppUrl: auth.tfaStore.tfaWinAppUrl,
|
||||||
|
currentColorScheme: auth.settingsStore.currentColorScheme,
|
||||||
}))(
|
}))(
|
||||||
withRouter(
|
withRouter(
|
||||||
withTranslation(["Confirm", "Common"])(observer(TfaActivationWrapper))
|
withTranslation(["Confirm", "Common"])(observer(TfaActivationWrapper))
|
||||||
|
@ -89,7 +89,7 @@ const History = ({
|
|||||||
return { ...fetchedHistory, feedsByDays: parsedFeeds };
|
return { ...fetchedHistory, feedsByDays: parsedFeeds };
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(async () => {
|
useEffect(() => {
|
||||||
if (!isMount.current) return;
|
if (!isMount.current) return;
|
||||||
|
|
||||||
if (selection.history) {
|
if (selection.history) {
|
||||||
@ -101,7 +101,8 @@ const History = ({
|
|||||||
}, [selection]);
|
}, [selection]);
|
||||||
|
|
||||||
if (showLoader) return <Loaders.InfoPanelViewLoader view="history" />;
|
if (showLoader) return <Loaders.InfoPanelViewLoader view="history" />;
|
||||||
if (!history || history?.feeds.length === 0) return <NoHistory t={t} />;
|
if (!history) return <></>;
|
||||||
|
if (history?.feeds?.length === 0) return <NoHistory t={t} />;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@ -142,7 +142,7 @@ const StyledSsoPage = styled.div`
|
|||||||
width: 350px;
|
width: 350px;
|
||||||
}
|
}
|
||||||
|
|
||||||
p > div {
|
.label > div {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user