diff --git a/conf/app.src b/conf/app.src index a81c75f..ee84525 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/ec3ebb91c08a7b03034e49e308dbce0a014ebc79.zip -SOURCE_SUM=2af09277b22a1a7a977bc61f0354db7f600657688772470677d89785e3729b3d +SOURCE_URL=https://github.com/outline/outline/archive/be5cddc14f824fdc55fc1b1e9d8b66bae9adad85.zip +SOURCE_SUM=072e5a0f6af5a685ab1bf3a5a7926e1bc48a19dc012eb9fb00e5e884a15bc2d3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2702961..2243978 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.5~ynh1", + "version": "0.69.1.0~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 4dce5e5..b7a34e4 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 1dd0adcac..c4d79f1f5 100644 +index 54b0dc071..4dd547421 100644 --- a/package.json +++ b/package.json -@@ -144,6 +144,7 @@ +@@ -145,6 +145,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 5271b5656..52b0c06a2 100644 +index cd09eb0bc..59ac91c42 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10320,6 +10320,14 @@ passport-oauth@1.0.x: +@@ -10276,6 +10276,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index 5271b5656..52b0c06a2 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" -@@ -10342,6 +10350,14 @@ passport@^0.6.0: +@@ -10298,6 +10306,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -139,7 +139,7 @@ index 5271b5656..52b0c06a2 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10551,6 +10567,11 @@ pkg-up@^3.1.0: +@@ -10507,6 +10523,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 bd486ce..5ef9d8c 100644 --- a/sources/patches/app-03-login.patch +++ b/sources/patches/app-03-login.patch @@ -36,10 +36,10 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 168165b08..9e1ec2f5d 100644 +index 30d678bb1..7ce6a7a30 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -214,7 +214,7 @@ function Login({ children }: Props) { +@@ -218,7 +218,7 @@ function Login({ children }: Props) { ) : ( <> @@ -48,7 +48,7 @@ index 168165b08..9e1ec2f5d 100644 authProviderName: config.name || env.APP_NAME, })} -@@ -232,7 +232,7 @@ function Login({ children }: Props) { +@@ -236,7 +236,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index edfeaf0..70f8b1a 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 3d954b274..d7a9b9539 100644 +index d9404e6ba..0c2b07b46 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -19,6 +19,7 @@ import { - ClockIcon, +@@ -20,6 +20,7 @@ import { CalendarIcon, MathIcon, + DoneIcon, + BookmarkedIcon, } from "outline-icons"; import * as React from "react"; import styled from "styled-components"; -@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { +@@ -196,6 +197,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { keywords: "notice card suggestion", attrs: { style: "tip" }, }, @@ -25,23 +25,23 @@ index 3d954b274..d7a9b9539 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 088d40e71..42cdcdb33 100644 +index 5d359bc0b..3d9cd5aff 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts -@@ -76,6 +76,8 @@ export default function useDictionary() { - showSource: t("Show source"), - warning: t("Warning"), +@@ -78,6 +78,8 @@ export default function useDictionary() { warningNotice: t("Warning notice"), + success: t("Success"), + successNotice: t("Success notice"), + bible: t("Bible"), + bibleNotice: t("Bible quote"), insertDate: t("Current date"), 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 7f39fd903..ede1728d1 100644 +index f76ad9aff..0d7948d6e 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -546,11 +546,6 @@ class DocumentScene extends React.Component { +@@ -548,11 +548,6 @@ class DocumentScene extends React.Component { @@ -54,26 +54,27 @@ index 7f39fd903..ede1728d1 100644 {!isShare && (