diff --git a/conf/app.src b/conf/app.src index 78ee0b2..cbc1747 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.67.0.zip -SOURCE_SUM=2fc6f8af630f53ed3be6d562cd6dea517e4c572debd663305e1ed53945d76797 +SOURCE_URL=https://github.com/outline/outline/archive/ad902af52ca174247c0baf6ce5e991458c131f35.zip +SOURCE_SUM=228a81e9e0ea3d86d310bac047f7e816066bfbfb605966c1f6912a7867a751d7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f2b1476..a83b23a 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.67.0~ynh1", + "version": "0.67.2~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 22a0724..475ab66 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,11 +1,12 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 669d00388..ccc5c047f 100644 +index 0d4dea367..5857ccb8a 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -121,6 +121,7 @@ export class Mailer { +@@ -123,6 +123,7 @@ export class Mailer { : { rejectUnauthorized: false, }, + ignoreTLS:true }; } + \ No newline at end of file diff --git a/sources/patches/app-03-visitor.patch b/sources/patches/app-03-visitor.patch index 256abb5..7aeb1a7 100644 --- a/sources/patches/app-03-visitor.patch +++ b/sources/patches/app-03-visitor.patch @@ -67,10 +67,10 @@ index 000000000..be344d2e2 + +export default router; diff --git a/yarn.lock b/yarn.lock -index ef3b53a5f..e5c12935e 100644 +index 67d407ca7..150665e94 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -11822,6 +11822,14 @@ passport-oauth@1.0.x: +@@ -12100,6 +12100,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -85,7 +85,7 @@ index ef3b53a5f..e5c12935e 100644 passport-slack-oauth2@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.1.1.tgz#d831ffc3f1e968fcc3622e6ecf41643c8d8f9cbc" -@@ -11844,6 +11852,14 @@ passport@^0.6.0: +@@ -12122,6 +12130,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -100,7 +100,7 @@ index ef3b53a5f..e5c12935e 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -12067,6 +12083,11 @@ pkg-up@^3.1.0: +@@ -12348,6 +12364,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" @@ -113,7 +113,7 @@ index ef3b53a5f..e5c12935e 100644 version "0.4.1" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" diff --git a/package.json b/package.json -index aa6796368..43617af55 100644 +index d64914567..ca674a5cd 100644 --- a/package.json +++ b/package.json @@ -145,6 +145,7 @@ @@ -122,5 +122,5 @@ index aa6796368..43617af55 100644 "passport-oauth2": "^1.6.1", + "passport-req": "^0.1.1", "passport-slack-oauth2": "^1.1.1", - "pg": "^8.5.1", + "pg": "^8.8.0", "pg-hstore": "^2.3.4", diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index bbafb29..37961d1 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -1,16 +1,16 @@ diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 143c28309..cd6830b12 100644 +index 42269b5e4..f5e5041e3 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -18,6 +18,7 @@ import { - AttachmentIcon, +@@ -19,6 +19,7 @@ import { ClockIcon, CalendarIcon, + MathIcon, + BookmarkedIcon, } from "outline-icons"; import * as React from "react"; import styled from "styled-components"; -@@ -180,6 +181,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { +@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { keywords: "notice card suggestion", attrs: { style: "tip" }, }, @@ -25,7 +25,7 @@ index 143c28309..cd6830b12 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 670017490..d8492e05d 100644 +index 5b9196de5..90caf27d7 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts @@ -75,6 +75,8 @@ export default function useDictionary() { @@ -38,7 +38,7 @@ index 670017490..d8492e05d 100644 insertTime: t("Current time"), insertDateTime: t("Current date and time"), diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts -index 239a8e7a6..c0dc3b3bd 100644 +index 5a4d4a079..e43c4fc29 100644 --- a/app/typings/styled-components.d.ts +++ b/app/typings/styled-components.d.ts @@ -53,6 +53,8 @@ declare module "styled-components" { @@ -51,10 +51,10 @@ index 239a8e7a6..c0dc3b3bd 100644 interface Colors { diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index 540c2f936..a9863bdca 100644 +index c61b0fdb4..6ea2a6798 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -515,6 +515,20 @@ h6 { +@@ -635,6 +635,20 @@ h6 { } } @@ -113,10 +113,10 @@ index 158a0dfb9..f297c3433 100644 component = ; } diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index 367e8ab9c..70066ddfd 100644 +index f28d552c0..1e6490890 100644 --- a/shared/styles/theme.ts +++ b/shared/styles/theme.ts -@@ -87,6 +87,8 @@ export const base = { +@@ -88,6 +88,8 @@ export const base = { noticeTipText: colors.almostBlack, noticeWarningBackground: "#d73a49", noticeWarningText: colors.almostBlack, @@ -125,11 +125,11 @@ index 367e8ab9c..70066ddfd 100644 breakpoints, }; -@@ -208,6 +210,7 @@ export const dark = { +@@ -213,6 +215,7 @@ export const dark = { noticeInfoText: colors.white, noticeTipText: colors.white, noticeWarningText: colors.white, + noticeBibleText: colors.white, progressBarBackground: colors.slate, scrollbarBackground: colors.black, - scrollbarThumb: colors.lightBlack, + scrollbarThumb: colors.lightBlack, \ No newline at end of file diff --git a/sources/patches/app-05-login.patch b/sources/patches/app-05-login.patch index 900b2fd..04d1af9 100644 --- a/sources/patches/app-05-login.patch +++ b/sources/patches/app-05-login.patch @@ -1,8 +1,8 @@ diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx -index b5bb854ad..d29e958be 100644 +index 7e124c124..0deb00a85 100644 --- a/app/scenes/Login/AuthenticationProvider.tsx +++ b/app/scenes/Login/AuthenticationProvider.tsx -@@ -67,7 +67,7 @@ function AuthenticationProvider(props: Props) { +@@ -91,7 +91,7 @@ function AuthenticationProvider(props: Props) { @@ -26,7 +26,7 @@ index b5bb854ad..d29e958be 100644 )} -@@ -106,7 +106,7 @@ function AuthenticationProvider(props: Props) { +@@ -120,7 +120,7 @@ function AuthenticationProvider(props: Props) { icon={} fullwidth > @@ -36,19 +36,19 @@ index b5bb854ad..d29e958be 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 81adf346e..e4bb23585 100644 +index 168165b08..9e1ec2f5d 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -188,7 +188,7 @@ function Login({ children }: Props) { +@@ -214,7 +214,7 @@ function Login({ children }: Props) { ) : ( <> - {t("Login to {{ authProviderName }}", { + {t("Bienvenue sur Anthropologie Biblique", { - authProviderName: config.name || "Outline", + authProviderName: config.name || env.APP_NAME, })} -@@ -206,7 +206,7 @@ function Login({ children }: Props) { +@@ -232,7 +232,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> diff --git a/sources/patches/app-06-logo.patch b/sources/patches/app-06-logo.patch deleted file mode 100644 index fa26237..0000000 --- a/sources/patches/app-06-logo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/app/components/OutlineLogo.tsx b/app/components/OutlineLogo.tsx -index 81eb48551..1fee69cd9 100644 ---- a/app/components/OutlineLogo.tsx -+++ b/app/components/OutlineLogo.tsx -@@ -16,7 +16,7 @@ function OutlineLogo({ size = 32, fill = "#333", className }: Props) { - xmlns="http://www.w3.org/2000/svg" - className={className} - > -- -+ - - ); - }