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

Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-08-07 17:00:06 +05:00
commit f2410cdd21
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/public/locales/en/InfoPanel.json
View File

@ -12,6 +12,7 @@
"FeedLocationLabel": "Folder «{{folderTitle}}»", "FeedLocationLabel": "Folder «{{folderTitle}}»",
"FeedLocationLabelFrom": "from «{{folderTitle}}»", "FeedLocationLabelFrom": "from «{{folderTitle}}»",
"FeedLocationRoomLabel": "Room «{{folderTitle}}»", "FeedLocationRoomLabel": "Room «{{folderTitle}}»",
"FeedLocationSectionLabel": "Section «{{folderTitle}}»",
"FileConverted": "File converted.", "FileConverted": "File converted.",
"FileCopied": "Files copied.", "FileCopied": "Files copied.",
"FileCopiedTo": "Files copied to «{{folderTitle}}»", "FileCopiedTo": "Files copied to «{{folderTitle}}»",

7
packages/client/src/components/dialogs/LogoutAllSessionDialog/index.js
View File

@ -56,10 +56,9 @@ const LogoutAllSessionDialog = ({
visible={visible} visible={visible}
onClose={onClose} onClose={onClose}
displayType="modal" displayType="modal"
autoMaxHeight
> >
<ModalDialog.Header> <ModalDialog.Header>{t("Common:LogoutButton")}</ModalDialog.Header>
{t("Profile:LogoutAllActiveConnections")}
</ModalDialog.Header>
<ModalDialog.Body> <ModalDialog.Body>
<Text>{t("Profile:LogoutDescription")}</Text> <Text>{t("Profile:LogoutDescription")}</Text>
<Text style={{ margin: "15px 0" }}> <Text style={{ margin: "15px 0" }}>
@ -70,8 +69,8 @@ const LogoutAllSessionDialog = ({
className="change-password" className="change-password"
isChecked={isChecked} isChecked={isChecked}
onChange={onChangeCheckbox} onChange={onChangeCheckbox}
label={t("Profile:ChangePasswordAfterLoggingOut")}
/> />
{t("Profile:ChangePasswordAfterLoggingOut")}
</Box> </Box>
</ModalDialog.Body> </ModalDialog.Body>
<ModalDialog.Footer> <ModalDialog.Footer>

10
packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx
View File

@ -27,6 +27,7 @@
import { withTranslation } from "react-i18next"; import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react"; import { inject, observer } from "mobx-react";
import { TTranslation } from "@docspace/shared/types"; import { TTranslation } from "@docspace/shared/types";
import { FolderType } from "@docspace/shared/enums";
import { StyledHistoryBlockMessage } from "../../../styles/history"; import { StyledHistoryBlockMessage } from "../../../styles/history";
type HistoryMainTextFolderInfoProps = { type HistoryMainTextFolderInfoProps = {
@ -54,12 +55,15 @@ const HistoryMainTextFolderInfo = ({
if (!parentTitle) return null; if (!parentTitle) return null;
const isFolder = parentType === 0; const isSection = parentType === FolderType.USER;
const isFromFolder = fromParentType === 0; const isFolder = parentType === FolderType.DEFAULT;
const isFromFolder = fromParentType === FolderType.DEFAULT;
const destination = isFolder const destination = isFolder
? t("FeedLocationLabel", { folderTitle: parentTitle }) ? t("FeedLocationLabel", { folderTitle: parentTitle })
: t("FeedLocationRoomLabel", { folderTitle: parentTitle }); : isSection
? t("FeedLocationSectionLabel", { folderTitle: parentTitle })
: t("FeedLocationRoomLabel", { folderTitle: parentTitle });
const sourceDestination = isFromFolder const sourceDestination = isFromFolder
? t("FeedLocationLabelFrom", { folderTitle: fromParentTitle }) ? t("FeedLocationLabelFrom", { folderTitle: fromParentTitle })

1
packages/client/src/store/SettingsSetupStore.js
View File

@ -586,7 +586,6 @@ class SettingsSetupStore {
}; };
getSessions = () => { getSessions = () => {
if (this.sessionsIsInit) return;
this.getAllSessions().then((res) => { this.getAllSessions().then((res) => {
this.setSessions(res.items); this.setSessions(res.items);
this.currentSession = res.loginEvent; this.currentSession = res.loginEvent;

4
packages/doceditor/src/components/file-password/index.tsx
View File

@ -54,7 +54,7 @@ import { ValidationStatus, WhiteLabelLogoType } from "@docspace/shared/enums";
import { validatePublicRoomPassword } from "@docspace/shared/api/rooms"; import { validatePublicRoomPassword } from "@docspace/shared/api/rooms";
import Image from "next/image"; import Image from "next/image";
const FilesPassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => { const FilePassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
const { t } = useTranslation(["Common"]); const { t } = useTranslation(["Common"]);
const theme = useTheme(); const theme = useTheme();
@ -210,4 +210,4 @@ const FilesPassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
); );
}; };
export default FilesPassword; export default FilePassword;