From 4315d86afc1fa58e672730fb7f9baf64122ad1f8 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 29 Sep 2023 12:01:51 +0700 Subject: [PATCH] First test 0.72.0.3 --- conf/.env | 2 + conf/app.src | 4 +- manifest.json | 2 +- sources/patches/app-01-email.patch | 5 +- sources/patches/app-02-visitor.patch | 40 ++++------- sources/patches/app-03-login.patch | 12 ++-- sources/patches/app-04-bible.patch | 44 +++++------- sources/patches/diff.txt | 100 +++++++++++---------------- 8 files changed, 85 insertions(+), 124 deletions(-) diff --git a/conf/.env b/conf/.env index f02bbac..9b45c3c 100644 --- a/conf/.env +++ b/conf/.env @@ -29,6 +29,8 @@ PORT=__PORT__ # A more detailed guide on setting up S3 is available here: # => https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f # +FILE_STORAGE=local +FILE_STORAGE_UPLOAD_MAX_SIZE=26214400 AWS_ACCESS_KEY_ID=__MINIO_ADMIN__ AWS_SECRET_ACCESS_KEY=__MINIO_PASSWORD__ AWS_REGION=fr-ynh-1 diff --git a/conf/app.src b/conf/app.src index 009b28f..4c3b553 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/25e8c32b8403042b6813e2a6861f4cd16586ed69.zip -SOURCE_SUM=8bb592ae014e653752311eb0664cc7741faaeb14b7101b06c5b55d878b616658 +SOURCE_URL=https://github.com/outline/outline/archive/5397907599d373bcb5cef8057d4c58526d64b084.zip +SOURCE_SUM=751bfaf5b1abb346337c537795540a4a809e544891d1313ed1df66b31261df5e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e578f30..1767e63 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.5~ynh1", + "version": "0.72.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 4ec6e3e..4d60e9a 100644 --- a/sources/patches/app-01-email.patch +++ b/sources/patches/app-01-email.patch @@ -1,12 +1,11 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 3584f03b4..c72e6f3fb 100644 +index 4d4f6f09c..f457025d5 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -138,6 +138,7 @@ export class Mailer { +@@ -208,6 +208,7 @@ export class Mailer { : { rejectUnauthorized: false, }, + ignoreTLS:true }; } - \ No newline at end of file diff --git a/sources/patches/app-02-visitor.patch b/sources/patches/app-02-visitor.patch index d3d1a81..c687d17 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -1,15 +1,15 @@ diff --git a/package.json b/package.json -index bd4069b81..9e14e1b8d 100644 +index 92b6ec86b..9215ec275 100644 --- a/package.json +++ b/package.json -@@ -144,6 +144,7 @@ - "passport": "^0.6.0", - "passport-google-oauth2": "^0.2.0", - "passport-oauth2": "^1.6.1", +@@ -157,6 +157,7 @@ + "patch-package": "^7.0.2", + "pg": "^8.11.1", + "pg-tsquery": "^8.4.1", + "passport-req": "^0.1.1", - "passport-slack-oauth2": "^1.1.1", - "patch-package": "^7.0.0", - "pg": "^8.8.0", + "polished": "^4.2.2", + "prosemirror-codemark": "^0.4.2", + "prosemirror-commands": "^1.5.2", diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json new file mode 100644 index 000000000..ae7c40333 @@ -106,10 +106,10 @@ index 000000000..bc03fc6d3 + +export default router; diff --git a/yarn.lock b/yarn.lock -index 42ced2fb5..7a4bf3f9c 100644 +index d9e8ec607..a1106ef17 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10174,6 +10174,14 @@ passport-oauth@1.0.x: +@@ -10340,6 +10340,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -121,10 +121,10 @@ index 42ced2fb5..7a4bf3f9c 100644 + passport "~0.1.1" + pkginfo "0.2.x" + - 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" -@@ -10196,6 +10204,14 @@ passport@^0.6.0: + 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" +@@ -10361,6 +10369,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" @@ -139,15 +139,3 @@ index 42ced2fb5..7a4bf3f9c 100644 passthrough-counter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" -@@ -10400,6 +10416,11 @@ pkg-up@^3.1.0: - dependencies: - find-up "^3.0.0" - -+pkginfo@0.2.x: -+ version "0.2.3" -+ resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8" -+ integrity sha512-7W7wTrE/NsY8xv/DTGjwNIyNah81EQH0MWcTzrHL6pOpMocOGZc0Mbdz9aXxSrp+U0mSmkU8jrNCDCfUs3sOBg== -+ - pkginfo@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" diff --git a/sources/patches/app-03-login.patch b/sources/patches/app-03-login.patch index c1dd86d..4ed113a 100644 --- a/sources/patches/app-03-login.patch +++ b/sources/patches/app-03-login.patch @@ -1,7 +1,7 @@ -diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx +diff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx index af218c06c..b2d93d994 100644 ---- a/app/scenes/Login/AuthenticationProvider.tsx -+++ b/app/scenes/Login/AuthenticationProvider.tsx +--- a/app/scenes/Login/components/AuthenticationProvider.tsx ++++ b/app/scenes/Login/components/AuthenticationProvider.tsx @@ -91,7 +91,7 @@ function AuthenticationProvider(props: Props) { diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index eec0fa0ed..70edd7eea 100644 +index de4245890..c751e3299 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -274,7 +274,7 @@ function Login({ children }: Props) { +@@ -255,7 +255,7 @@ function Login({ children }: Props) { ) : ( <> @@ -48,7 +48,7 @@ index eec0fa0ed..70edd7eea 100644 authProviderName: config.name || env.APP_NAME, })} -@@ -292,7 +292,7 @@ function Login({ children }: Props) { +@@ -273,7 +273,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index 3849661..399e15f 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 d9404e6ba..0c2b07b46 100644 +index f795fc56d..a4dc4e17a 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -20,6 +20,7 @@ import { - CalendarIcon, +@@ -21,6 +21,7 @@ import { MathIcon, DoneIcon, + EmbedIcon, + BookmarkedIcon, } from "outline-icons"; import * as React from "react"; import styled from "styled-components"; -@@ -196,6 +197,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { +@@ -203,6 +204,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { keywords: "notice card suggestion", attrs: { style: "tip" }, }, @@ -25,7 +25,7 @@ index d9404e6ba..0c2b07b46 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 5d359bc0b..3d9cd5aff 100644 +index 6472c88cc..8bedb092d 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts @@ -78,6 +78,8 @@ export default function useDictionary() { @@ -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 fac830c75..b4399e34b 100644 +index 8e3542d40..8a7c461af 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -545,11 +545,6 @@ class DocumentScene extends React.Component { +@@ -552,11 +552,6 @@ class DocumentScene extends React.Component { @@ -54,10 +54,10 @@ index fac830c75..b4399e34b 100644 {!isShare && (