diff --git a/manifest.json b/manifest.json index 8dc49e3..b03024d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki and knowledge base for teams", "fr": "Wiki et base de connaissances pour les équipes" }, - "version": "0.68.3~ynh1", + "version": "0.68.4~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/sources/patches/app-02-visitor.patch b/sources/patches/app-02-visitor.patch index 7d69b19..78f3ca3 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -12,12 +12,12 @@ index 5cf338265..0c05d9dab 100644 "pg": "^8.8.0", diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json new file mode 100644 -index 000000000..2f50562e5 +index 000000000..ae7c40333 --- /dev/null +++ b/plugins/req/plugin.json @@ -0,0 +1,4 @@ +{ -+ "name": "Req", ++ "name": "visiteur", + "description": "Adds an req compatible authentication provider." +} diff --git a/plugins/req/server/.babelrc b/plugins/req/server/.babelrc diff --git a/sources/patches/app-05-comments.patch b/sources/patches/app-05-comments.patch index 6e5c417..b53b14f 100644 --- a/sources/patches/app-05-comments.patch +++ b/sources/patches/app-05-comments.patch @@ -1,8 +1,16 @@ diff --git a/app/scenes/Settings/Features.tsx b/app/scenes/Settings/Features.tsx -index 4fe94b044..59ac35485 100644 +index 4fe94b044..0218d19a6 100644 --- a/app/scenes/Settings/Features.tsx +++ b/app/scenes/Settings/Features.tsx -@@ -57,7 +57,7 @@ function Features() { +@@ -11,6 +11,7 @@ import useCurrentTeam from "~/hooks/useCurrentTeam"; + import useStores from "~/hooks/useStores"; + import useToasts from "~/hooks/useToasts"; + import SettingRow from "./components/SettingRow"; ++import Flex from "~/components/Flex"; + + function Features() { + const { auth } = useStores(); +@@ -57,7 +58,7 @@ function Features() { /> )} @@ -11,7 +19,7 @@ index 4fe94b044..59ac35485 100644 name={TeamPreference.Commenting} label={ -@@ -75,7 +75,7 @@ function Features() { +@@ -75,7 +76,7 @@ function Features() { disabled={!team.collaborativeEditing} onChange={handlePreferenceChange} />