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

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

Browse Source
This commit is contained in:
Timofey Boyko 2024-07-08 16:19:58 +03:00
commit b2b6293743
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/pages/Home/InfoPanel/Body/styles/history.js
View File

@ -105,11 +105,10 @@ const StyledHistoryBlockMessage = styled.div`
display: inline-flex;
gap: 4px;
max-width: 100%;
.main-message {
width: max-content;
max-width: 100%;
min-width: max-content;
padding-inline-end: 4px;
}

9
packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/RoomExternalLink.tsx
View File

@ -110,17 +110,16 @@ const HistoryRoomExternalLink = ({
);
};
export default inject<TStore>(({ userStore, dialogsStore, infoPanelStore }) => {
export default inject<TStore>(({ dialogsStore, infoPanelStore }) => {
const { infoPanelSelection } = infoPanelStore;
const { setLinkParams, setEditLinkPanelIsVisible } = dialogsStore;
const { user } = userStore;
const { id, roomType } = infoPanelSelection!;
const { id, roomType, security } = infoPanelSelection!;
const { EditRoom } = security!;
const isFormRoom = roomType === RoomsType.FormRoom;
const cannotEdit = user?.isVisitor || user?.isCollaborator;
return {
canEditLink: !cannotEdit,
canEditLink: EditRoom,
setEditLinkPanelIsVisible,
setLinkParams,
roomId: id,

1
packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
View File

@ -28,6 +28,7 @@ import styled, { css } from "styled-components";
import { UnavailableStyles } from "../../../../utils/commonSettingsStyles";
const StyledSsoPage = styled.div`
max-width: 100%;
box-sizing: border-box;
outline: none;

4
packages/client/src/pages/Profile/Section/Body/index.js
View File

@ -57,8 +57,8 @@ const Wrapper = styled.div`
const StyledTabs = styled(Tabs)`
> .sticky {
z-index: 201;
margin-inline-end: -17px;
padding-inline-end: 17px;
margin-inline-end: -16px;
padding-inline-end: 16px;
}
`;

2
packages/client/src/routes/portalSettings.js
View File

@ -66,7 +66,7 @@ const WelcomePageSettings = loadable(() =>
);
const DNSSettings = loadable(() =>
componentLoader(
() => () =>
() =>
import(
"../pages/PortalSettings/categories/common/Customization/dns-settings"
),