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

Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-07-24 16:00:13 +05:00
commit 3a4132edfa
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/components/dialogs/CreateEditGroupDialog/CreateEditGroupDialog.styled.ts
View File

@ -29,4 +29,8 @@ import { ModalDialog } from "@docspace/shared/components/modal-dialog";
export const StyledModal = styled(ModalDialog)` export const StyledModal = styled(ModalDialog)`
user-select: none; user-select: none;
.modal-body {
padding-top: 20px;
}
`; `;

2
packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
View File

@ -279,7 +279,7 @@ class ConsumerModalDialog extends React.Component {
> >
<ModalDialog.Header>{selectedConsumer.title}</ModalDialog.Header> <ModalDialog.Header>{selectedConsumer.title}</ModalDialog.Header>
<ModalDialog.Body> <ModalDialog.Body>
<Box paddingProp="0 0 16px">{consumerInstruction}</Box> <Box paddingProp="16px 0 16px">{consumerInstruction}</Box>
<React.Fragment> <React.Fragment>
{selectedConsumer.props.map((prop, i) => {selectedConsumer.props.map((prop, i) =>
this.inputsRender(prop, i), this.inputsRender(prop, i),

1
packages/doceditor/src/components/Editor.tsx
View File

@ -169,6 +169,7 @@ const Editor = ({
goBack = { goBack = {
requestClose: true, requestClose: true,
text: openFileLocationText, text: openFileLocationText,
blank: openOnNewPage,
}; };
} else { } else {
goBack = { goBack = {

6
packages/login/src/components/LoginForm/index.tsx
View File

@ -42,7 +42,10 @@ import { useSearchParams } from "next/navigation";
import { Text } from "@docspace/shared/components/text"; import { Text } from "@docspace/shared/components/text";
import { Button, ButtonSize } from "@docspace/shared/components/button"; import { Button, ButtonSize } from "@docspace/shared/components/button";
import { createPasswordHash } from "@docspace/shared/utils/common"; import {
createPasswordHash,
frameCallCommand,
} from "@docspace/shared/utils/common";
import { checkPwd } from "@docspace/shared/utils/desktop"; import { checkPwd } from "@docspace/shared/utils/desktop";
import { login } from "@docspace/shared/utils/loginUtils"; import { login } from "@docspace/shared/utils/loginUtils";
import { toastr } from "@docspace/shared/components/toast"; import { toastr } from "@docspace/shared/components/toast";
@ -116,6 +119,7 @@ const LoginForm = ({
setIdentifier(email); setIdentifier(email);
setEmailFromInvitation(email); setEmailFromInvitation(email);
frameCallCommand("setIsLoaded");
}, [loginData]); }, [loginData]);
const authCallback = useCallback( const authCallback = useCallback(