YunoHost-Apps/outline_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/outline_ynh.git synced 2024-09-03 19:56:12 +02:00
Code Issues Activity Actions

Update v0.78

Browse source
This commit is contained in:
Limezy 2024-08-25 21:50:21 +07:00
parent 2b48f35539
commit 9f3692bb7b
5 changed files with 77 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Outline"
description.en = "Wiki and knowledge base for teams"
description.fr = "Wiki et base de connaissances pour les équipes"
version = "0.76.1~ynh1"
version = "0.78.0~ynh1"
maintainers = ["Raoul de Limezy"]
@ -55,8 +55,8 @@ ram.runtime = "50M"
[resources]
[resources.sources.main]
url = "https://github.com/outline/outline/archive/86abd274b0865a4453bd5245392a0a042e68931b.zip"
sha256 = "65cd3b1d4420cd4ae1f50345b45c89ede2d75b377576cdc6d2db48d5f24c6c4c"
url = "https://github.com/outline/outline/archive/2578a1f75f5ec74492e5154352b527e98f480f20.zip"
sha256 = "09c330456646df73a1a34b54e522eeeefc338d27a8010961126ca761986b06fe"
[resources.system_user]
allow_email = true

73
sources/patches/diff.txt
View file

@ -1,5 +1,5 @@
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
index 301c2610d..1e6917bd8 100644
index 05e9acee6..aca761095 100644
--- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx
@@ -20,6 +20,7 @@ import {
@ -25,10 +25,10 @@ index 301c2610d..1e6917bd8 100644
name: "separator",
},
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
index cfbd81bcd..683fa6883 100644
index e8178b11d..9dac7edba 100644
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
@@ -83,6 +83,8 @@ export default function useDictionary() {
@@ -85,6 +85,8 @@ export default function useDictionary() {
warningNotice: t("Warning notice"),
success: t("Success"),
successNotice: t("Success notice"),
@ -38,13 +38,13 @@ index cfbd81bcd..683fa6883 100644
insertTime: t("Current time"),
insertDateTime: t("Current date and time"),
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index 094c9dafb..a749e8e6a 100644
index 752915e89..5eefe890c 100644
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
@@ -547,11 +547,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
@@ -599,11 +599,6 @@ class DocumentScene extends React.Component<Props> {
)}
</React.Suspense>
</MaxWidth>
</Main>
- {isShare &&
- !parseDomain(window.location.origin).custom &&
- !auth.user && (
@ -54,7 +54,7 @@ index 094c9dafb..a749e8e6a 100644
{!isShare && (
<Footer>
diff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx
index 0eede84bd..2da7f4438 100644
index d70f3dcb8..5efdfbd86 100644
--- a/app/scenes/Login/components/AuthenticationProvider.tsx
+++ b/app/scenes/Login/components/AuthenticationProvider.tsx
@@ -70,7 +70,7 @@ function AuthenticationProvider(props: Props) {
@ -69,32 +69,32 @@ index 0eede84bd..2da7f4438 100644
@@ -79,12 +79,12 @@ function AuthenticationProvider(props: Props) {
short
/>
<ButtonLarge type="submit" disabled={isSubmitting}>
<ButtonLarge type="submit" disabled={isSubmitting} {...rest}>
- {t("Sign In")} →
+ {t("S'identifier")} →
</ButtonLarge>
</>
) : (
<ButtonLarge type="submit" icon={<EmailIcon />} fullwidth>
<ButtonLarge type="submit" icon={<EmailIcon />} fullwidth {...rest}>
- {t("Continue with Email")}
+ {t("Accès membre (email)")}
</ButtonLarge>
)}
</Form>
@@ -99,7 +99,7 @@ function AuthenticationProvider(props: Props) {
icon={<PluginIcon id={id} />}
fullwidth
>
- {t("Continue with {{ authProviderName }}", {
+ {t("Accès {{ authProviderName }}", {
authProviderName: name,
})}
</ButtonLarge>
fullwidth
{...rest}
>
- {t("Continue with {{ authProviderName }}", {
+ {t("Accès {{ authProviderName }}", {
authProviderName: name,
})}
</ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 2f486c827..bebfa31ae 100644
index b2b8c3929..78590e823 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -261,7 +261,7 @@ function Login({ children }: Props) {
@@ -267,7 +267,7 @@ function Login({ children }: Props) {
) : (
<>
<StyledHeading as="h2" centered>
@ -103,7 +103,7 @@ index 2f486c827..bebfa31ae 100644
authProviderName: config.name || env.APP_NAME,
})}
</StyledHeading>
@@ -279,7 +279,7 @@ function Login({ children }: Props) {
@@ -285,7 +285,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && (
<>
<Note>
@ -113,7 +113,7 @@ index 2f486c827..bebfa31ae 100644
})}
</Note>
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
index be368444f..ecfcae00c 100644
index 0a5da6e6f..bc64bb3bc 100644
--- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts
@@ -54,6 +54,8 @@ declare module "styled-components" {
@ -126,17 +126,17 @@ index be368444f..ecfcae00c 100644
interface Colors {
diff --git a/package.json b/package.json
index ada9fc0be..62d550282 100644
index fd6010972..800dd9882 100644
--- a/package.json
+++ b/package.json
@@ -164,6 +164,7 @@
@@ -169,6 +169,7 @@
"pg-tsquery": "^8.4.2",
"pluralize": "^8.0.0",
"png-chunks-extract": "^1.0.0",
+ "passport-req": "^0.1.1",
"polished": "^4.3.1",
"prosemirror-codemark": "^0.4.2",
"prosemirror-commands": "^1.5.2",
"prosemirror-commands": "^1.6.0",
diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json
new file mode 100644
index 000000000..88780ccd7
@ -151,7 +151,7 @@ index 000000000..88780ccd7
+}
diff --git a/plugins/req/server/auth/req.ts b/plugins/req/server/auth/req.ts
new file mode 100644
index 000000000..6fca14d54
index 000000000..da37414e9
--- /dev/null
+++ b/plugins/req/server/auth/req.ts
@@ -0,0 +1,70 @@
@ -185,7 +185,7 @@ index 000000000..6fca14d54
+ new ReqStrategy(
+ async function (req,done) {
+ try {
+ const domain = "domain.tld";
+ const domain = "anthropologiebiblique.fr";
+ const subdomain = domain.split(".")[0];
+ const teamName = capitalize(subdomain);
+ const name = "visiteur";
@ -225,6 +225,7 @@ index 000000000..6fca14d54
+}
+
+export default router;
\ No newline at end of file
diff --git a/plugins/req/server/index.ts b/plugins/req/server/index.ts
new file mode 100644
index 000000000..68081fb65
@ -258,10 +259,10 @@ index f53e44b6b..bcf56efca 100644
}
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index ba7386cb7..caf852129 100644
index 9567dab95..896a1ced4 100644
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
@@ -894,6 +894,20 @@ h6 {
@@ -949,6 +949,20 @@ h6 {
}
}
@ -312,7 +313,7 @@ index bd976e69b..9ee40b8d5 100644
component = <InfoIcon />;
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index 7ade24ab4..bfa263c64 100644
index 35b410dde..daa0a3e3e 100644
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
@@ -31,6 +31,7 @@ const defaultColors: Colors = {
@ -323,10 +324,10 @@ index 7ade24ab4..bfa263c64 100644
brand: {
red: "#FF5C80",
pink: "#FF4DFA",
@@ -96,6 +97,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
@@ -98,6 +99,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
noticeSuccessBackground: colors.brand.green,
noticeSuccessText: colors.almostBlack,
tableSelectedBackground: transparentize(0.8, colors.accent),
tableSelectedBackground: transparentize(0.9, colors.accent),
+ noticeBibleBackground: "#996633",
+ noticeBibleText: colors.almostBlack,
breakpoints,
@ -341,10 +342,10 @@ index 7ade24ab4..bfa263c64 100644
scrollbarBackground: colors.black,
scrollbarThumb: colors.lightBlack,
diff --git a/yarn.lock b/yarn.lock
index d29efefc4..e9fccc0e7 100644
index bb51a8f70..884861c76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10653,6 +10653,14 @@ passport-oauth@1.0.x:
@@ -12104,6 +12104,14 @@ passport-oauth@1.0.x:
passport-oauth1 "1.x.x"
passport-oauth2 "1.x.x"
@ -359,7 +360,7 @@ index d29efefc4..e9fccc0e7 100644
passport-slack-oauth2@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4"
@@ -10683,6 +10691,14 @@ passport@^0.7.0:
@@ -12134,6 +12142,14 @@ passport@^0.7.0:
pause "0.0.1"
utils-merge "^1.0.1"
@ -374,7 +375,7 @@ index d29efefc4..e9fccc0e7 100644
passthrough-counter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa"
@@ -10890,6 +10906,11 @@ pkg-up@^3.1.0:
@@ -12341,6 +12357,11 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"

19
sources/patches/main-02-visitor.patch
View file

@ -1,15 +1,15 @@
diff --git a/package.json b/package.json
index ada9fc0be..62d550282 100644
index fd6010972..800dd9882 100644
--- a/package.json
+++ b/package.json
@@ -164,6 +164,7 @@
@@ -169,6 +169,7 @@
"pg-tsquery": "^8.4.2",
"pluralize": "^8.0.0",
"png-chunks-extract": "^1.0.0",
+ "passport-req": "^0.1.1",
"polished": "^4.3.1",
"prosemirror-codemark": "^0.4.2",
"prosemirror-commands": "^1.5.2",
"prosemirror-commands": "^1.6.0",
diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json
new file mode 100644
index 000000000..88780ccd7
@ -24,7 +24,7 @@ index 000000000..88780ccd7
+}
diff --git a/plugins/req/server/auth/req.ts b/plugins/req/server/auth/req.ts
new file mode 100644
index 000000000..6fca14d54
index 000000000..da37414e9
--- /dev/null
+++ b/plugins/req/server/auth/req.ts
@@ -0,0 +1,70 @@
@ -58,7 +58,7 @@ index 000000000..6fca14d54
+ new ReqStrategy(
+ async function (req,done) {
+ try {
+ const domain = "domain.tld";
+ const domain = "anthropologiebiblique.fr";
+ const subdomain = domain.split(".")[0];
+ const teamName = capitalize(subdomain);
+ const name = "visiteur";
@ -98,6 +98,7 @@ index 000000000..6fca14d54
+}
+
+export default router;
\ No newline at end of file
diff --git a/plugins/req/server/index.ts b/plugins/req/server/index.ts
new file mode 100644
index 000000000..68081fb65
@ -119,10 +120,10 @@ index 000000000..68081fb65
+ });
+}
diff --git a/yarn.lock b/yarn.lock
index d29efefc4..e9fccc0e7 100644
index bb51a8f70..884861c76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10653,6 +10653,14 @@ passport-oauth@1.0.x:
@@ -12104,6 +12104,14 @@ passport-oauth@1.0.x:
passport-oauth1 "1.x.x"
passport-oauth2 "1.x.x"
@ -137,7 +138,7 @@ index d29efefc4..e9fccc0e7 100644
passport-slack-oauth2@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4"
@@ -10683,6 +10691,14 @@ passport@^0.7.0:
@@ -12134,6 +12142,14 @@ passport@^0.7.0:
pause "0.0.1"
utils-merge "^1.0.1"
@ -152,7 +153,7 @@ index d29efefc4..e9fccc0e7 100644
passthrough-counter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa"
@@ -10890,6 +10906,11 @@ pkg-up@^3.1.0:
@@ -12341,6 +12357,11 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"

28
sources/patches/main-03-login.patch
View file

@ -1,5 +1,5 @@
diff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx
index 5d564453d..9e3c5b55b 100644
index d70f3dcb8..5efdfbd86 100644
--- a/app/scenes/Login/components/AuthenticationProvider.tsx
+++ b/app/scenes/Login/components/AuthenticationProvider.tsx
@@ -70,7 +70,7 @@ function AuthenticationProvider(props: Props) {
@ -14,32 +14,32 @@ index 5d564453d..9e3c5b55b 100644
@@ -79,12 +79,12 @@ function AuthenticationProvider(props: Props) {
short
/>
<ButtonLarge type="submit" disabled={isSubmitting}>
<ButtonLarge type="submit" disabled={isSubmitting} {...rest}>
- {t("Sign In")} →
+ {t("S'identifier")} →
</ButtonLarge>
</>
) : (
<ButtonLarge type="submit" icon={<EmailIcon />} fullwidth>
<ButtonLarge type="submit" icon={<EmailIcon />} fullwidth {...rest}>
- {t("Continue with Email")}
+ {t("Accès membre (email)")}
</ButtonLarge>
)}
</Form>
@@ -99,7 +99,7 @@ function AuthenticationProvider(props: Props) {
icon={<PluginIcon id={id} />}
fullwidth
>
- {t("Continue with {{ authProviderName }}", {
+ {t("Accès {{ authProviderName }}", {
authProviderName: name,
})}
</ButtonLarge>
fullwidth
{...rest}
>
- {t("Continue with {{ authProviderName }}", {
+ {t("Accès {{ authProviderName }}", {
authProviderName: name,
})}
</ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 9a9650b48..5357d5cf5 100644
index b2b8c3929..78590e823 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -264,7 +264,7 @@ function Login({ children }: Props) {
@@ -267,7 +267,7 @@ function Login({ children }: Props) {
) : (
<>
<StyledHeading as="h2" centered>
@ -48,7 +48,7 @@ index 9a9650b48..5357d5cf5 100644
authProviderName: config.name || env.APP_NAME,
})}
</StyledHeading>
@@ -282,7 +282,7 @@ function Login({ children }: Props) {
@@ -285,7 +285,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && (
<>
<Note>

26
sources/patches/main-04-bible.patch
View file

@ -1,5 +1,5 @@
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
index 301c2610d..1e6917bd8 100644
index 05e9acee6..aca761095 100644
--- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx
@@ -20,6 +20,7 @@ import {
@ -25,10 +25,10 @@ index 301c2610d..1e6917bd8 100644
name: "separator",
},
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
index 6a73e6750..15b74aa9e 100644
index e8178b11d..9dac7edba 100644
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
@@ -81,6 +81,8 @@ export default function useDictionary() {
@@ -85,6 +85,8 @@ export default function useDictionary() {
warningNotice: t("Warning notice"),
success: t("Success"),
successNotice: t("Success notice"),
@ -38,13 +38,13 @@ index 6a73e6750..15b74aa9e 100644
insertTime: t("Current time"),
insertDateTime: t("Current date and time"),
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index a231a90ee..67684d36d 100644
index 752915e89..5eefe890c 100644
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
@@ -532,11 +532,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
@@ -599,11 +599,6 @@ class DocumentScene extends React.Component<Props> {
)}
</React.Suspense>
</MaxWidth>
</Main>
- {isShare &&
- !parseDomain(window.location.origin).custom &&
- !auth.user && (
@ -54,7 +54,7 @@ index a231a90ee..67684d36d 100644
{!isShare && (
<Footer>
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
index be368444f..ecfcae00c 100644
index 0a5da6e6f..bc64bb3bc 100644
--- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts
@@ -54,6 +54,8 @@ declare module "styled-components" {
@ -67,10 +67,10 @@ index be368444f..ecfcae00c 100644
interface Colors {
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index bdebcc6c0..ca670a66f 100644
index 9567dab95..896a1ced4 100644
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
@@ -886,6 +886,20 @@ h6 {
@@ -949,6 +949,20 @@ h6 {
}
}
@ -121,7 +121,7 @@ index bd976e69b..9ee40b8d5 100644
component = <InfoIcon />;
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index 5f10aa263..137f125c9 100644
index 35b410dde..daa0a3e3e 100644
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
@@ -31,6 +31,7 @@ const defaultColors: Colors = {
@ -132,10 +132,10 @@ index 5f10aa263..137f125c9 100644
brand: {
red: "#FF5C80",
pink: "#FF4DFA",
@@ -96,6 +97,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
@@ -98,6 +99,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
noticeSuccessBackground: colors.brand.green,
noticeSuccessText: colors.almostBlack,
tableSelectedBackground: transparentize(0.8, colors.accent),
tableSelectedBackground: transparentize(0.9, colors.accent),
+ noticeBibleBackground: "#996633",
+ noticeBibleText: colors.almostBlack,
breakpoints,