diff --git a/conf/app.src b/conf/app.src index a345dca..a81c75f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/68640860fb9cf584f155348ae06e4536226bef16.zip -SOURCE_SUM=a883915940d3e7889a49240e34d7ed577bd3ca82a306680b87e1fa976d1d5225 +SOURCE_URL=https://github.com/outline/outline/archive/ec3ebb91c08a7b03034e49e308dbce0a014ebc79.zip +SOURCE_SUM=2af09277b22a1a7a977bc61f0354db7f600657688772470677d89785e3729b3d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a1b7684..2702961 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.0.4~ynh1", + "version": "0.68.0.5~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 0e8b30c..4dce5e5 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 545dfad5c..6c020d972 100644 +index 1dd0adcac..c4d79f1f5 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 adb11de5d..466600db9 100644 +index 5271b5656..52b0c06a2 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10495,6 +10495,14 @@ passport-oauth@1.0.x: +@@ -10320,6 +10320,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index adb11de5d..466600db9 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" -@@ -10517,6 +10525,14 @@ passport@^0.6.0: +@@ -10342,6 +10350,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -139,7 +139,7 @@ index adb11de5d..466600db9 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10726,6 +10742,11 @@ pkg-up@^3.1.0: +@@ -10551,6 +10567,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index bbc15f1..edfeaf0 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -38,10 +38,10 @@ index 088d40e71..42cdcdb33 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 3d55a359e..50510b816 100644 +index 7f39fd903..ede1728d1 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -632,11 +632,6 @@ class DocumentScene extends React.Component { +@@ -546,11 +546,6 @@ class DocumentScene extends React.Component { @@ -67,10 +67,10 @@ index 5981671d8..b3791b363 100644 interface Colors { diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index 03c10edc8..73f40c1f9 100644 +index 9f91264db..fc2f51734 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -653,6 +653,20 @@ h6 { +@@ -648,6 +648,20 @@ h6 { } } diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt index 3ebc8f4..b5cfa79 100644 --- a/sources/patches/diff.txt +++ b/sources/patches/diff.txt @@ -54,10 +54,10 @@ index 088d40e71..42cdcdb33 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 3d55a359e..50510b816 100644 +index 7f39fd903..ede1728d1 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -632,11 +632,6 @@ class DocumentScene extends React.Component { +@@ -546,11 +546,6 @@ class DocumentScene extends React.Component { @@ -142,7 +142,7 @@ index 5981671d8..b3791b363 100644 interface Colors { diff --git a/package.json b/package.json -index 545dfad5c..6c020d972 100644 +index 1dd0adcac..c4d79f1f5 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 03c10edc8..73f40c1f9 100644 +index 9f91264db..fc2f51734 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -653,6 +653,20 @@ h6 { +@@ -648,6 +648,20 @@ h6 { } } @@ -324,7 +324,7 @@ index 158a0dfb9..f297c3433 100644 component = ; } diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index 76f94cfc3..9351a57a6 100644 +index 9fc5687c3..93fa5e418 100644 --- a/shared/styles/theme.ts +++ b/shared/styles/theme.ts @@ -93,6 +93,8 @@ const buildBaseTheme = (input: Partial) => { @@ -345,10 +345,10 @@ index 76f94cfc3..9351a57a6 100644 scrollbarBackground: colors.black, scrollbarThumb: colors.lightBlack, diff --git a/yarn.lock b/yarn.lock -index adb11de5d..466600db9 100644 +index 5271b5656..52b0c06a2 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10495,6 +10495,14 @@ passport-oauth@1.0.x: +@@ -10320,6 +10320,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -363,7 +363,7 @@ index adb11de5d..466600db9 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" -@@ -10517,6 +10525,14 @@ passport@^0.6.0: +@@ -10342,6 +10350,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -378,7 +378,7 @@ index adb11de5d..466600db9 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10726,6 +10742,11 @@ pkg-up@^3.1.0: +@@ -10551,6 +10567,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0"