diff --git a/conf/app.src b/conf/app.src index c2b6203..900735e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/18905535d36176a0058e54905d3d3daebf3bfbfc.zip -SOURCE_SUM=a58b2b268914c9ec35716151ed516aa026d51b4184a80f0a5361a417e9b5ace5 +SOURCE_URL=https://github.com/outline/outline/archive/d663b92f2a49b1fea02b74295abf192c77c35f3b.zip +SOURCE_SUM=20dd069a77b4dcf87737a9b909f8e2c5022a78c68a012129cab0451a2d7788d9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cb56070..c2b9411 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.2~ynh1", + "version": "0.68.0.3~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/sources/patches/app-01-email.patch b/sources/patches/app-01-email.patch index dbb8633..4ec6e3e 100644 --- a/sources/patches/app-01-email.patch +++ b/sources/patches/app-01-email.patch @@ -1,8 +1,8 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 5df80a051..4e32de826 100644 +index 3584f03b4..c72e6f3fb 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -122,6 +122,7 @@ export class Mailer { +@@ -138,6 +138,7 @@ export class Mailer { : { rejectUnauthorized: false, }, diff --git a/sources/patches/app-02-visitor.patch b/sources/patches/app-02-visitor.patch index 7bcafcb..0e8b30c 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -1,8 +1,8 @@ diff --git a/package.json b/package.json -index aad57975c..da175737d 100644 +index 545dfad5c..6c020d972 100644 --- a/package.json +++ b/package.json -@@ -143,6 +143,7 @@ +@@ -144,6 +144,7 @@ "passport": "^0.6.0", "passport-google-oauth2": "^0.2.0", "passport-oauth2": "^1.6.1", @@ -106,10 +106,10 @@ index 000000000..bc03fc6d3 + +export default router; diff --git a/yarn.lock b/yarn.lock -index f36f6d2d6..47a6cea8d 100644 +index adb11de5d..466600db9 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10179,6 +10179,14 @@ passport-oauth@1.0.x: +@@ -10495,6 +10495,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index f36f6d2d6..47a6cea8d 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" -@@ -10201,6 +10209,14 @@ passport@^0.6.0: +@@ -10517,6 +10525,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -139,7 +139,7 @@ index f36f6d2d6..47a6cea8d 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10410,6 +10426,11 @@ pkg-up@^3.1.0: +@@ -10726,6 +10742,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 120cf28..bbc15f1 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -1,5 +1,5 @@ diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 42269b5e4..174c84c02 100644 +index 3d954b274..d7a9b9539 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx @@ -19,6 +19,7 @@ import { @@ -54,7 +54,7 @@ index 3d55a359e..50510b816 100644 {!isShare && (