mirror of
https://github.com/YunoHost-Apps/outline_ynh.git
synced 2024-09-03 19:56:12 +02:00
v0.69.2 first try
This commit is contained in:
parent
280de1490e
commit
f8e978facf
6 changed files with 29 additions and 29 deletions
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://github.com/outline/outline/archive/be5cddc14f824fdc55fc1b1e9d8b66bae9adad85.zip
|
||||
SOURCE_SUM=072e5a0f6af5a685ab1bf3a5a7926e1bc48a19dc012eb9fb00e5e884a15bc2d3
|
||||
SOURCE_URL=https://github.com/outline/outline/archive/aff9413b0f5aee7f00a93c9aa290525f08f58ab1.zip
|
||||
SOURCE_SUM=28927f7342e4604021f2a3b1fc50d93c61bc8ec5421ca8298621fa6595c66a67
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=zip
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Wiki and knowledge base for teams",
|
||||
"fr": "Wiki et base de connaissances pour les équipes"
|
||||
},
|
||||
"version": "0.69.1.0~ynh1",
|
||||
"version": "0.69.2.0~ynh1",
|
||||
"url": "www.getoutline.com",
|
||||
"upstream": {
|
||||
"license": "BUSL-1.1",
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
diff --git a/package.json b/package.json
|
||||
index 54b0dc071..4dd547421 100644
|
||||
index 532c6f45e..9a2a62072 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -145,6 +145,7 @@
|
||||
@@ -144,6 +144,7 @@
|
||||
"passport": "^0.6.0",
|
||||
"passport-google-oauth2": "^0.2.0",
|
||||
"passport-oauth2": "^1.6.1",
|
||||
+ "passport-req": "^0.1.1",
|
||||
"passport-slack-oauth2": "^1.1.1",
|
||||
"patch-package": "^6.5.1",
|
||||
"patch-package": "^7.0.0",
|
||||
"pg": "^8.8.0",
|
||||
diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json
|
||||
new file mode 100644
|
||||
|
@ -106,10 +106,10 @@ index 000000000..bc03fc6d3
|
|||
+
|
||||
+export default router;
|
||||
diff --git a/yarn.lock b/yarn.lock
|
||||
index cd09eb0bc..59ac91c42 100644
|
||||
index 059235284..16a4b2988 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -10276,6 +10276,14 @@ passport-oauth@1.0.x:
|
||||
@@ -10257,6 +10257,14 @@ passport-oauth@1.0.x:
|
||||
passport-oauth1 "1.x.x"
|
||||
passport-oauth2 "1.x.x"
|
||||
|
||||
|
@ -124,7 +124,7 @@ index cd09eb0bc..59ac91c42 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"
|
||||
@@ -10298,6 +10306,14 @@ passport@^0.6.0:
|
||||
@@ -10279,6 +10287,14 @@ passport@^0.6.0:
|
||||
pause "0.0.1"
|
||||
utils-merge "^1.0.1"
|
||||
|
||||
|
@ -139,7 +139,7 @@ index cd09eb0bc..59ac91c42 100644
|
|||
passthrough-counter@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa"
|
||||
@@ -10507,6 +10523,11 @@ pkg-up@^3.1.0:
|
||||
@@ -10483,6 +10499,11 @@ pkg-up@^3.1.0:
|
||||
dependencies:
|
||||
find-up "^3.0.0"
|
||||
|
||||
|
|
|
@ -36,10 +36,10 @@ index af218c06c..b2d93d994 100644
|
|||
})}
|
||||
</ButtonLarge>
|
||||
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
|
||||
index 30d678bb1..7ce6a7a30 100644
|
||||
index 7b6d9fea2..8d779c8e3 100644
|
||||
--- a/app/scenes/Login/index.tsx
|
||||
+++ b/app/scenes/Login/index.tsx
|
||||
@@ -218,7 +218,7 @@ function Login({ children }: Props) {
|
||||
@@ -274,7 +274,7 @@ function Login({ children }: Props) {
|
||||
) : (
|
||||
<>
|
||||
<StyledHeading as="h2" centered>
|
||||
|
@ -48,7 +48,7 @@ index 30d678bb1..7ce6a7a30 100644
|
|||
authProviderName: config.name || env.APP_NAME,
|
||||
})}
|
||||
</StyledHeading>
|
||||
@@ -236,7 +236,7 @@ function Login({ children }: Props) {
|
||||
@@ -292,7 +292,7 @@ function Login({ children }: Props) {
|
||||
{hasMultipleProviders && (
|
||||
<>
|
||||
<Note>
|
||||
|
|
|
@ -67,7 +67,7 @@ index e30b32de3..1beeccf75 100644
|
|||
|
||||
interface Colors {
|
||||
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
|
||||
index 6283408e1..ea3674365 100644
|
||||
index 9c01e2447..6ea20aa0d 100644
|
||||
--- a/shared/editor/components/Styles.ts
|
||||
+++ b/shared/editor/components/Styles.ts
|
||||
@@ -661,6 +661,18 @@ h6 {
|
||||
|
@ -90,7 +90,7 @@ index 6283408e1..ea3674365 100644
|
|||
}
|
||||
|
||||
diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx
|
||||
index 788ab5882..1c6c2a9bf 100644
|
||||
index 9b8939fc3..e59591427 100644
|
||||
--- a/shared/editor/nodes/Notice.tsx
|
||||
+++ b/shared/editor/nodes/Notice.tsx
|
||||
@@ -1,5 +1,5 @@
|
||||
|
@ -117,7 +117,7 @@ index 788ab5882..1c6c2a9bf 100644
|
|||
: undefined,
|
||||
}),
|
||||
},
|
||||
@@ -100,6 +103,8 @@ export default class Notice extends Node {
|
||||
@@ -114,6 +117,8 @@ export default class Notice extends Node {
|
||||
component = <WarningIcon />;
|
||||
} else if (node.attrs.style === "success") {
|
||||
component = <DoneIcon />;
|
||||
|
|
|
@ -107,10 +107,10 @@ index af218c06c..b2d93d994 100644
|
|||
})}
|
||||
</ButtonLarge>
|
||||
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
|
||||
index 30d678bb1..7ce6a7a30 100644
|
||||
index 7b6d9fea2..8d779c8e3 100644
|
||||
--- a/app/scenes/Login/index.tsx
|
||||
+++ b/app/scenes/Login/index.tsx
|
||||
@@ -218,7 +218,7 @@ function Login({ children }: Props) {
|
||||
@@ -274,7 +274,7 @@ function Login({ children }: Props) {
|
||||
) : (
|
||||
<>
|
||||
<StyledHeading as="h2" centered>
|
||||
|
@ -119,7 +119,7 @@ index 30d678bb1..7ce6a7a30 100644
|
|||
authProviderName: config.name || env.APP_NAME,
|
||||
})}
|
||||
</StyledHeading>
|
||||
@@ -236,7 +236,7 @@ function Login({ children }: Props) {
|
||||
@@ -292,7 +292,7 @@ function Login({ children }: Props) {
|
||||
{hasMultipleProviders && (
|
||||
<>
|
||||
<Note>
|
||||
|
@ -142,16 +142,16 @@ index e30b32de3..1beeccf75 100644
|
|||
|
||||
interface Colors {
|
||||
diff --git a/package.json b/package.json
|
||||
index 54b0dc071..4dd547421 100644
|
||||
index 532c6f45e..9a2a62072 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -145,6 +145,7 @@
|
||||
@@ -144,6 +144,7 @@
|
||||
"passport": "^0.6.0",
|
||||
"passport-google-oauth2": "^0.2.0",
|
||||
"passport-oauth2": "^1.6.1",
|
||||
+ "passport-req": "^0.1.1",
|
||||
"passport-slack-oauth2": "^1.1.1",
|
||||
"patch-package": "^6.5.1",
|
||||
"patch-package": "^7.0.0",
|
||||
"pg": "^8.8.0",
|
||||
diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json
|
||||
new file mode 100644
|
||||
|
@ -262,7 +262,7 @@ index 3584f03b4..c72e6f3fb 100644
|
|||
}
|
||||
|
||||
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
|
||||
index 6283408e1..ea3674365 100644
|
||||
index 9c01e2447..6ea20aa0d 100644
|
||||
--- a/shared/editor/components/Styles.ts
|
||||
+++ b/shared/editor/components/Styles.ts
|
||||
@@ -661,6 +661,18 @@ h6 {
|
||||
|
@ -285,7 +285,7 @@ index 6283408e1..ea3674365 100644
|
|||
}
|
||||
|
||||
diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx
|
||||
index 788ab5882..1c6c2a9bf 100644
|
||||
index 9b8939fc3..e59591427 100644
|
||||
--- a/shared/editor/nodes/Notice.tsx
|
||||
+++ b/shared/editor/nodes/Notice.tsx
|
||||
@@ -1,5 +1,5 @@
|
||||
|
@ -312,7 +312,7 @@ index 788ab5882..1c6c2a9bf 100644
|
|||
: undefined,
|
||||
}),
|
||||
},
|
||||
@@ -100,6 +103,8 @@ export default class Notice extends Node {
|
||||
@@ -114,6 +117,8 @@ export default class Notice extends Node {
|
||||
component = <WarningIcon />;
|
||||
} else if (node.attrs.style === "success") {
|
||||
component = <DoneIcon />;
|
||||
|
@ -343,10 +343,10 @@ index f3d83141e..c576a67c2 100644
|
|||
scrollbarBackground: colors.black,
|
||||
scrollbarThumb: colors.lightBlack,
|
||||
diff --git a/yarn.lock b/yarn.lock
|
||||
index cd09eb0bc..59ac91c42 100644
|
||||
index 059235284..16a4b2988 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -10276,6 +10276,14 @@ passport-oauth@1.0.x:
|
||||
@@ -10257,6 +10257,14 @@ passport-oauth@1.0.x:
|
||||
passport-oauth1 "1.x.x"
|
||||
passport-oauth2 "1.x.x"
|
||||
|
||||
|
@ -361,7 +361,7 @@ index cd09eb0bc..59ac91c42 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"
|
||||
@@ -10298,6 +10306,14 @@ passport@^0.6.0:
|
||||
@@ -10279,6 +10287,14 @@ passport@^0.6.0:
|
||||
pause "0.0.1"
|
||||
utils-merge "^1.0.1"
|
||||
|
||||
|
@ -376,7 +376,7 @@ index cd09eb0bc..59ac91c42 100644
|
|||
passthrough-counter@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa"
|
||||
@@ -10507,6 +10523,11 @@ pkg-up@^3.1.0:
|
||||
@@ -10483,6 +10499,11 @@ pkg-up@^3.1.0:
|
||||
dependencies:
|
||||
find-up "^3.0.0"
|
||||
|
||||
|
|
Loading…
Reference in a new issue