YunoHost-Apps/outline_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/outline_ynh.git synced 2024-09-03 19:56:12 +02:00
Code Issues Activity Actions

Update to latest main

Browse source
This commit is contained in:
Limezy 2023-03-15 10:03:28 +07:00
parent 208737deb2
commit 50680ae132
7 changed files with 30 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/outline/outline/archive/18905535d36176a0058e54905d3d3daebf3bfbfc.zip SOURCE_URL=https://github.com/outline/outline/archive/d663b92f2a49b1fea02b74295abf192c77c35f3b.zip
SOURCE_SUM=a58b2b268914c9ec35716151ed516aa026d51b4184a80f0a5361a417e9b5ace5 SOURCE_SUM=20dd069a77b4dcf87737a9b909f8e2c5022a78c68a012129cab0451a2d7788d9
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Wiki and knowledge base for teams", "en": "Wiki and knowledge base for teams",
"fr": "Wiki et base de connaissances pour les équipes" "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", "url": "www.getoutline.com",
"upstream": { "upstream": {
"license": "BUSL-1.1", "license": "BUSL-1.1",

4
sources/patches/app-01-email.patch
View file

@ -1,8 +1,8 @@
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx 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 --- a/server/emails/mailer.tsx
+++ b/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, rejectUnauthorized: false,
}, },

12
sources/patches/app-02-visitor.patch
View file

@ -1,8 +1,8 @@
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index aad57975c..da175737d 100644 index 545dfad5c..6c020d972 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -143,6 +143,7 @@ @@ -144,6 +144,7 @@
"passport": "^0.6.0", "passport": "^0.6.0",
"passport-google-oauth2": "^0.2.0", "passport-google-oauth2": "^0.2.0",
"passport-oauth2": "^1.6.1", "passport-oauth2": "^1.6.1",
@ -106,10 +106,10 @@ index 000000000..bc03fc6d3
+ +
+export default router; +export default router;
diff --git a/yarn.lock b/yarn.lock diff --git a/yarn.lock b/yarn.lock
index f36f6d2d6..47a6cea8d 100644 index adb11de5d..466600db9 100644
--- a/yarn.lock --- a/yarn.lock
+++ b/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-oauth1 "1.x.x"
passport-oauth2 "1.x.x" passport-oauth2 "1.x.x"
@ -124,7 +124,7 @@ index f36f6d2d6..47a6cea8d 100644
passport-slack-oauth2@^1.1.1: passport-slack-oauth2@^1.1.1:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.1.1.tgz#d831ffc3f1e968fcc3622e6ecf41643c8d8f9cbc" 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" pause "0.0.1"
utils-merge "^1.0.1" utils-merge "^1.0.1"
@ -139,7 +139,7 @@ index f36f6d2d6..47a6cea8d 100644
passthrough-counter@^1.0.0: passthrough-counter@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" 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: dependencies:
find-up "^3.0.0" find-up "^3.0.0"

8
sources/patches/app-04-bible.patch
View file

@ -1,5 +1,5 @@
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx 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 --- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx
@@ -19,6 +19,7 @@ import { @@ -19,6 +19,7 @@ import {
@ -54,7 +54,7 @@ index 3d55a359e..50510b816 100644
{!isShare && ( {!isShare && (
<Footer> <Footer>
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
index c9a41b710..812dc1612 100644 index 5981671d8..b3791b363 100644
--- a/app/typings/styled-components.d.ts --- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts +++ b/app/typings/styled-components.d.ts
@@ -53,6 +53,8 @@ declare module "styled-components" { @@ -53,6 +53,8 @@ declare module "styled-components" {
@ -67,10 +67,10 @@ index c9a41b710..812dc1612 100644
interface Colors { interface Colors {
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index 6fe93455a..0b257801b 100644 index 03c10edc8..73f40c1f9 100644
--- a/shared/editor/components/Styles.ts --- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts
@@ -642,6 +642,20 @@ h6 { @@ -653,6 +653,20 @@ h6 {
} }
} }

31
sources/patches/app-05-comments.patch
View file

@ -1,31 +0,0 @@
diff --git a/app/scenes/Settings/Features.tsx b/app/scenes/Settings/Features.tsx
index 4fe94b044..5fd14def3 100644
--- a/app/scenes/Settings/Features.tsx
+++ b/app/scenes/Settings/Features.tsx
@@ -11,6 +11,8 @@ import useCurrentTeam from "~/hooks/useCurrentTeam";
import useStores from "~/hooks/useStores";
import useToasts from "~/hooks/useToasts";
import SettingRow from "./components/SettingRow";
+import Flex from "~/components/Flex";
+import Badge from "~/components/Badge";
function Features() {
const { auth } = useStores();
@@ -57,7 +59,7 @@ function Features() {
/>
</SettingRow>
)}
- {/* <SettingRow
+ {<SettingRow
name={TeamPreference.Commenting}
label={
<Flex align="center">
@@ -75,7 +77,7 @@ function Features() {
disabled={!team.collaborativeEditing}
onChange={handlePreferenceChange}
/>
- </SettingRow> */}
+ </SettingRow>}
{team.avatarUrl && (
<SettingRow
name={TeamPreference.PublicBranding}

61
sources/patches/diff.txt
View file

@ -15,7 +15,7 @@ index 05fa32927..33fc7ee21 100644
); );
} }
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx 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 --- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx
@@ -19,6 +19,7 @@ import { @@ -19,6 +19,7 @@ import {
@ -128,39 +128,8 @@ index 168165b08..9e1ec2f5d 100644
authProviderName: defaultProvider.name, authProviderName: defaultProvider.name,
})} })}
</Note> </Note>
diff --git a/app/scenes/Settings/Features.tsx b/app/scenes/Settings/Features.tsx
index 4fe94b044..5fd14def3 100644
--- a/app/scenes/Settings/Features.tsx
+++ b/app/scenes/Settings/Features.tsx
@@ -11,6 +11,8 @@ import useCurrentTeam from "~/hooks/useCurrentTeam";
import useStores from "~/hooks/useStores";
import useToasts from "~/hooks/useToasts";
import SettingRow from "./components/SettingRow";
+import Flex from "~/components/Flex";
+import Badge from "~/components/Badge";
function Features() {
const { auth } = useStores();
@@ -57,7 +59,7 @@ function Features() {
/>
</SettingRow>
)}
- {/* <SettingRow
+ {<SettingRow
name={TeamPreference.Commenting}
label={
<Flex align="center">
@@ -75,7 +77,7 @@ function Features() {
disabled={!team.collaborativeEditing}
onChange={handlePreferenceChange}
/>
- </SettingRow> */}
+ </SettingRow>}
{team.avatarUrl && (
<SettingRow
name={TeamPreference.PublicBranding}
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
index c9a41b710..812dc1612 100644 index 5981671d8..b3791b363 100644
--- a/app/typings/styled-components.d.ts --- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts +++ b/app/typings/styled-components.d.ts
@@ -53,6 +53,8 @@ declare module "styled-components" { @@ -53,6 +53,8 @@ declare module "styled-components" {
@ -173,10 +142,10 @@ index c9a41b710..812dc1612 100644
interface Colors { interface Colors {
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index aad57975c..da175737d 100644 index 545dfad5c..6c020d972 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -143,6 +143,7 @@ @@ -144,6 +144,7 @@
"passport": "^0.6.0", "passport": "^0.6.0",
"passport-google-oauth2": "^0.2.0", "passport-google-oauth2": "^0.2.0",
"passport-oauth2": "^1.6.1", "passport-oauth2": "^1.6.1",
@ -281,10 +250,10 @@ index 000000000..bc03fc6d3
+export default router; +export default router;
\ No newline at end of file \ No newline at end of file
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx 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 --- a/server/emails/mailer.tsx
+++ b/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, rejectUnauthorized: false,
}, },
@ -293,10 +262,10 @@ index 5df80a051..4e32de826 100644
} }
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index 6fe93455a..0b257801b 100644 index 03c10edc8..73f40c1f9 100644
--- a/shared/editor/components/Styles.ts --- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts
@@ -642,6 +642,20 @@ h6 { @@ -653,6 +653,20 @@ h6 {
} }
} }
@ -355,10 +324,10 @@ index 158a0dfb9..f297c3433 100644
component = <InfoIcon color="currentColor" />; component = <InfoIcon color="currentColor" />;
} }
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index fe2441c3c..11b972f03 100644 index 76f94cfc3..9351a57a6 100644
--- a/shared/styles/theme.ts --- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts +++ b/shared/styles/theme.ts
@@ -92,6 +92,8 @@ const buildBaseTheme = (input: Partial<Colors>) => { @@ -93,6 +93,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
noticeTipText: colors.almostBlack, noticeTipText: colors.almostBlack,
noticeWarningBackground: "#d73a49", noticeWarningBackground: "#d73a49",
noticeWarningText: colors.almostBlack, noticeWarningText: colors.almostBlack,
@ -367,7 +336,7 @@ index fe2441c3c..11b972f03 100644
breakpoints, breakpoints,
...colors, ...colors,
...spacing, ...spacing,
@@ -233,6 +235,7 @@ export const buildDarkTheme = (input: Partial<Colors>): DefaultTheme => { @@ -236,6 +238,7 @@ export const buildDarkTheme = (input: Partial<Colors>): DefaultTheme => {
noticeInfoText: colors.white, noticeInfoText: colors.white,
noticeTipText: colors.white, noticeTipText: colors.white,
noticeWarningText: colors.white, noticeWarningText: colors.white,
@ -376,10 +345,10 @@ index fe2441c3c..11b972f03 100644
scrollbarBackground: colors.black, scrollbarBackground: colors.black,
scrollbarThumb: colors.lightBlack, scrollbarThumb: colors.lightBlack,
diff --git a/yarn.lock b/yarn.lock diff --git a/yarn.lock b/yarn.lock
index f36f6d2d6..47a6cea8d 100644 index adb11de5d..466600db9 100644
--- a/yarn.lock --- a/yarn.lock
+++ b/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-oauth1 "1.x.x"
passport-oauth2 "1.x.x" passport-oauth2 "1.x.x"
@ -394,7 +363,7 @@ index f36f6d2d6..47a6cea8d 100644
passport-slack-oauth2@^1.1.1: passport-slack-oauth2@^1.1.1:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.1.1.tgz#d831ffc3f1e968fcc3622e6ecf41643c8d8f9cbc" 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" pause "0.0.1"
utils-merge "^1.0.1" utils-merge "^1.0.1"
@ -409,7 +378,7 @@ index f36f6d2d6..47a6cea8d 100644
passthrough-counter@^1.0.0: passthrough-counter@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa" 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: dependencies:
find-up "^3.0.0" find-up "^3.0.0"