yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Allow websockets and collaboration service to run in the same process (#2674)

Browse Source
This commit is contained in:
Tom Moor
2021-10-19 21:18:20 -07:00
committed by GitHub
parent 3610a7f4a2
commit d443abfc57
11 changed files with 67 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/components/Sidebar/Settings.js
View File

@@ -96,15 +96,13 @@ function SettingsSidebar() {
label={t("Security")}
/>
)}
{can.update &&
env.COLLABORATION_URL &&
env.DEPLOYMENT !== "hosted" && (
<SidebarLink
to="/settings/features"
icon={<BeakerIcon color="currentColor" />}
label={t("Features")}
/>
)}
{can.update && env.DEPLOYMENT !== "hosted" && (
<SidebarLink
to="/settings/features"
icon={<BeakerIcon color="currentColor" />}
label={t("Features")}
/>
)}
<SidebarLink
to="/settings/members"
icon={<UserIcon color="currentColor" />}

18
app/scenes/Settings/Features.js
View File

@@ -9,7 +9,6 @@ import Checkbox from "components/Checkbox";
import Heading from "components/Heading";
import HelpText from "components/HelpText";
import Scene from "components/Scene";
import env from "env";
import useCurrentTeam from "hooks/useCurrentTeam";
import useStores from "hooks/useStores";
import useToasts from "hooks/useToasts";
@@ -53,16 +52,13 @@ function Features() {
all team members.
</Trans>
</HelpText>
{env.COLLABORATION_URL && (
<Checkbox
label={t("Collaborative editing")}
name="collaborativeEditing"
checked={data.collaborativeEditing}
onChange={handleChange}
note="When enabled multiple people can edit documents at the same time (Beta)"
/>
)}
<Checkbox
label={t("Collaborative editing")}
name="collaborativeEditing"
checked={data.collaborativeEditing}
onChange={handleChange}
note="When enabled multiple people can edit documents at the same time (Beta)"
/>
</Scene>
);
}