diff --git a/sources/patches/app-02-visitor.patch b/sources/patches/app-02-visitor.patch index 2328111..8be4dd3 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -1,11 +1,11 @@ diff --git a/package.json b/package.json -index f4d7d2080..456f5349c 100644 +index e0d3f56ea..fcd1ce270 100644 --- a/package.json +++ b/package.json -@@ -158,6 +158,7 @@ - "pg": "^8.11.1", +@@ -160,6 +160,7 @@ "pg-tsquery": "^8.4.1", "pluralize": "^8.0.0", + "png-chunks-extract": "^1.0.0", + "passport-req": "^0.1.1", "polished": "^4.2.2", "prosemirror-codemark": "^0.4.2", @@ -106,10 +106,10 @@ index 000000000..bc03fc6d3 + +export default router; diff --git a/yarn.lock b/yarn.lock -index 4abdce687..5b31b8d81 100644 +index c47df111a..3d7a8e387 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10119,6 +10119,14 @@ passport-oauth@1.0.x: +@@ -10290,6 +10290,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index 4abdce687..5b31b8d81 100644 passport-slack-oauth2@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4" -@@ -10140,6 +10148,14 @@ passport@^0.6.0: +@@ -10320,6 +10328,14 @@ passport@^0.7.0: pause "0.0.1" utils-merge "^1.0.1" diff --git a/sources/patches/app-03-login.patch b/sources/patches/app-03-login.patch index 589f4f4..c73e7ce 100644 --- a/sources/patches/app-03-login.patch +++ b/sources/patches/app-03-login.patch @@ -1,8 +1,8 @@ -diff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx -index af218c06c..b2d93d994 100644 +ddiff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx +index 5d564453d..9e3c5b55b 100644 --- a/app/scenes/Login/components/AuthenticationProvider.tsx +++ b/app/scenes/Login/components/AuthenticationProvider.tsx -@@ -91,7 +91,7 @@ function AuthenticationProvider(props: Props) { +@@ -70,7 +70,7 @@ function AuthenticationProvider(props: Props) { @@ -26,7 +26,7 @@ index af218c06c..b2d93d994 100644 )} -@@ -120,7 +120,7 @@ function AuthenticationProvider(props: Props) { +@@ -99,7 +99,7 @@ function AuthenticationProvider(props: Props) { icon={} fullwidth > @@ -36,10 +36,10 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 57f82919c..65efc59c9 100644 +index 9a9650b48..5357d5cf5 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -257,7 +257,7 @@ function Login({ children }: Props) { +@@ -264,7 +264,7 @@ function Login({ children }: Props) { ) : ( <> @@ -48,7 +48,7 @@ index 57f82919c..65efc59c9 100644 authProviderName: config.name || env.APP_NAME, })} -@@ -275,7 +275,7 @@ function Login({ children }: Props) { +@@ -282,7 +282,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index 55c8ae5..19cf215 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -25,10 +25,10 @@ index 301c2610d..1e6917bd8 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 6e9f9c383..8791bddb7 100644 +index 6a73e6750..15b74aa9e 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts -@@ -76,6 +76,8 @@ export default function useDictionary() { +@@ -81,6 +81,8 @@ export default function useDictionary() { warningNotice: t("Warning notice"), success: t("Success"), successNotice: t("Success notice"), @@ -38,10 +38,10 @@ index 6e9f9c383..8791bddb7 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 9eb541af1..d2c2e5a24 100644 +index a231a90ee..67684d36d 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -556,11 +556,6 @@ class DocumentScene extends React.Component { +@@ -532,11 +532,6 @@ class DocumentScene extends React.Component { @@ -54,7 +54,7 @@ index 9eb541af1..d2c2e5a24 100644 {!isShare && (