From 061f44432e4e1367044ec18f1eba05cb9ba73312 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 25 Jun 2023 01:18:41 +0700 Subject: [PATCH] Update --- conf/app.src | 4 ++-- manifest.json | 2 +- sources/patches/app-02-visitor.patch | 10 +++++----- sources/patches/app-03-login.patch | 2 +- sources/patches/app-04-bible.patch | 14 +++++++------- sources/patches/diff.txt | 26 +++++++++++++------------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/conf/app.src b/conf/app.src index ee76d65..009b28f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/aff9413b0f5aee7f00a93c9aa290525f08f58ab1.zip -SOURCE_SUM=28927f7342e4604021f2a3b1fc50d93c61bc8ec5421ca8298621fa6595c66a67 +SOURCE_URL=https://github.com/outline/outline/archive/25e8c32b8403042b6813e2a6861f4cd16586ed69.zip +SOURCE_SUM=8bb592ae014e653752311eb0664cc7741faaeb14b7101b06c5b55d878b616658 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c118d5f..6c85b4d 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.69.2.0~ynh1", + "version": "0.69.2.1~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 b23a38f..d3d1a81 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -1,5 +1,5 @@ diff --git a/package.json b/package.json -index 532c6f45e..9a2a62072 100644 +index bd4069b81..9e14e1b8d 100644 --- a/package.json +++ b/package.json @@ -144,6 +144,7 @@ @@ -106,10 +106,10 @@ index 000000000..bc03fc6d3 + +export default router; diff --git a/yarn.lock b/yarn.lock -index 059235284..16a4b2988 100644 +index 42ced2fb5..7a4bf3f9c 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10257,6 +10257,14 @@ passport-oauth@1.0.x: +@@ -10174,6 +10174,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index 059235284..16a4b2988 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" -@@ -10279,6 +10287,14 @@ passport@^0.6.0: +@@ -10196,6 +10204,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -139,7 +139,7 @@ index 059235284..16a4b2988 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10483,6 +10499,11 @@ pkg-up@^3.1.0: +@@ -10400,6 +10416,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" diff --git a/sources/patches/app-03-login.patch b/sources/patches/app-03-login.patch index 84f2d27..c1dd86d 100644 --- a/sources/patches/app-03-login.patch +++ b/sources/patches/app-03-login.patch @@ -36,7 +36,7 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 7b6d9fea2..8d779c8e3 100644 +index eec0fa0ed..70edd7eea 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx @@ -274,7 +274,7 @@ function Login({ children }: Props) { diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index f891ea2..0f0e297 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -38,10 +38,10 @@ index 5d359bc0b..3d9cd5aff 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 f76ad9aff..0d7948d6e 100644 +index fac830c75..b4399e34b 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -548,11 +548,6 @@ class DocumentScene extends React.Component { +@@ -545,11 +545,6 @@ class DocumentScene extends React.Component { @@ -67,10 +67,10 @@ index e30b32de3..1beeccf75 100644 interface Colors { diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index 9c01e2447..6ea20aa0d 100644 +index c553d3d27..8d14b876f 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -661,6 +661,18 @@ h6 { +@@ -660,6 +660,18 @@ h6 { a { color: ${props.theme.noticeSuccessText}; @@ -90,7 +90,7 @@ index 9c01e2447..6ea20aa0d 100644 } diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx -index 9b8939fc3..e59591427 100644 +index 2193d0b02..3cbfe5326 100644 --- a/shared/editor/nodes/Notice.tsx +++ b/shared/editor/nodes/Notice.tsx @@ -1,5 +1,5 @@ @@ -108,7 +108,7 @@ index 9b8939fc3..e59591427 100644 }); } -@@ -50,6 +51,8 @@ export default class Notice extends Node { +@@ -51,6 +52,8 @@ export default class Notice extends Node { ? "warning" : dom.className.includes("success") ? "success" @@ -117,7 +117,7 @@ index 9b8939fc3..e59591427 100644 : undefined, }), }, -@@ -114,6 +117,8 @@ export default class Notice extends Node { +@@ -115,6 +118,8 @@ export default class Notice extends Node { component = ; } else if (node.attrs.style === "success") { component = ; diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt index d4f4742..e98743e 100644 --- a/sources/patches/diff.txt +++ b/sources/patches/diff.txt @@ -54,10 +54,10 @@ index 5d359bc0b..3d9cd5aff 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 f76ad9aff..0d7948d6e 100644 +index fac830c75..b4399e34b 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -548,11 +548,6 @@ class DocumentScene extends React.Component { +@@ -545,11 +545,6 @@ class DocumentScene extends React.Component { @@ -107,7 +107,7 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 7b6d9fea2..8d779c8e3 100644 +index eec0fa0ed..70edd7eea 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx @@ -274,7 +274,7 @@ function Login({ children }: Props) { @@ -142,7 +142,7 @@ index e30b32de3..1beeccf75 100644 interface Colors { diff --git a/package.json b/package.json -index 532c6f45e..9a2a62072 100644 +index bd4069b81..9e14e1b8d 100644 --- a/package.json +++ b/package.json @@ -144,6 +144,7 @@ @@ -262,10 +262,10 @@ index 3584f03b4..c72e6f3fb 100644 } diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index 9c01e2447..6ea20aa0d 100644 +index c553d3d27..8d14b876f 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -661,6 +661,18 @@ h6 { +@@ -660,6 +660,18 @@ h6 { a { color: ${props.theme.noticeSuccessText}; @@ -285,7 +285,7 @@ index 9c01e2447..6ea20aa0d 100644 } diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx -index 9b8939fc3..e59591427 100644 +index 2193d0b02..3cbfe5326 100644 --- a/shared/editor/nodes/Notice.tsx +++ b/shared/editor/nodes/Notice.tsx @@ -1,5 +1,5 @@ @@ -303,7 +303,7 @@ index 9b8939fc3..e59591427 100644 }); } -@@ -50,6 +51,8 @@ export default class Notice extends Node { +@@ -51,6 +52,8 @@ export default class Notice extends Node { ? "warning" : dom.className.includes("success") ? "success" @@ -312,7 +312,7 @@ index 9b8939fc3..e59591427 100644 : undefined, }), }, -@@ -114,6 +117,8 @@ export default class Notice extends Node { +@@ -115,6 +118,8 @@ export default class Notice extends Node { component = ; } else if (node.attrs.style === "success") { component = ; @@ -343,10 +343,10 @@ index f3d83141e..c576a67c2 100644 scrollbarBackground: colors.black, scrollbarThumb: colors.lightBlack, diff --git a/yarn.lock b/yarn.lock -index 059235284..16a4b2988 100644 +index 42ced2fb5..7a4bf3f9c 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10257,6 +10257,14 @@ passport-oauth@1.0.x: +@@ -10174,6 +10174,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -361,7 +361,7 @@ index 059235284..16a4b2988 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" -@@ -10279,6 +10287,14 @@ passport@^0.6.0: +@@ -10196,6 +10204,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -376,7 +376,7 @@ index 059235284..16a4b2988 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10483,6 +10499,11 @@ pkg-up@^3.1.0: +@@ -10400,6 +10416,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0"