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

Upgrade to v0.67.2 with anthropologiebiblique changes

Browse source
This commit is contained in:
Limezy 2023-01-27 23:21:38 +07:00
parent 4901c1e4af
commit 3196324188
7 changed files with 32 additions and 44 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/refs/tags/v0.67.0.zip
SOURCE_SUM=2fc6f8af630f53ed3be6d562cd6dea517e4c572debd663305e1ed53945d76797
SOURCE_URL=https://github.com/outline/outline/archive/ad902af52ca174247c0baf6ce5e991458c131f35.zip
SOURCE_SUM=228a81e9e0ea3d86d310bac047f7e816066bfbfb605966c1f6912a7867a751d7
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Wiki and knowledge base for teams",
"fr": "Wiki et base de connaissances pour les équipes"
},
"version": "0.67.0~ynh1",
"version": "0.67.2~ynh1",
"url": "www.getoutline.com",
"upstream": {
"license": "BUSL-1.1",

5
sources/patches/app-02-email.patch
View file

@ -1,11 +1,12 @@
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index 669d00388..ccc5c047f 100644
index 0d4dea367..5857ccb8a 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -121,6 +121,7 @@ export class Mailer {
@@ -123,6 +123,7 @@ export class Mailer {
: {
rejectUnauthorized: false,
},
+ ignoreTLS:true
};
}

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

@ -67,10 +67,10 @@ index 000000000..be344d2e2
+
+export default router;
diff --git a/yarn.lock b/yarn.lock
index ef3b53a5f..e5c12935e 100644
index 67d407ca7..150665e94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11822,6 +11822,14 @@ passport-oauth@1.0.x:
@@ -12100,6 +12100,14 @@ passport-oauth@1.0.x:
passport-oauth1 "1.x.x"
passport-oauth2 "1.x.x"
@ -85,7 +85,7 @@ index ef3b53a5f..e5c12935e 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"
@@ -11844,6 +11852,14 @@ passport@^0.6.0:
@@ -12122,6 +12130,14 @@ passport@^0.6.0:
pause "0.0.1"
utils-merge "^1.0.1"
@ -100,7 +100,7 @@ index ef3b53a5f..e5c12935e 100644
passthrough-counter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/passthrough-counter/-/passthrough-counter-1.0.0.tgz#1967d9e66da572b5c023c787db112a387ab166fa"
@@ -12067,6 +12083,11 @@ pkg-up@^3.1.0:
@@ -12348,6 +12364,11 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"
@ -113,7 +113,7 @@ index ef3b53a5f..e5c12935e 100644
version "0.4.1"
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
diff --git a/package.json b/package.json
index aa6796368..43617af55 100644
index d64914567..ca674a5cd 100644
--- a/package.json
+++ b/package.json
@@ -145,6 +145,7 @@
@ -122,5 +122,5 @@ index aa6796368..43617af55 100644
"passport-oauth2": "^1.6.1",
+ "passport-req": "^0.1.1",
"passport-slack-oauth2": "^1.1.1",
"pg": "^8.5.1",
"pg": "^8.8.0",
"pg-hstore": "^2.3.4",

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

@ -1,16 +1,16 @@
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
index 143c28309..cd6830b12 100644
index 42269b5e4..f5e5041e3 100644
--- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx
@@ -18,6 +18,7 @@ import {
AttachmentIcon,
@@ -19,6 +19,7 @@ import {
ClockIcon,
CalendarIcon,
MathIcon,
+ BookmarkedIcon,
} from "outline-icons";
import * as React from "react";
import styled from "styled-components";
@@ -180,6 +181,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
keywords: "notice card suggestion",
attrs: { style: "tip" },
},
@ -25,7 +25,7 @@ index 143c28309..cd6830b12 100644
name: "separator",
},
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
index 670017490..d8492e05d 100644
index 5b9196de5..90caf27d7 100644
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
@@ -75,6 +75,8 @@ export default function useDictionary() {
@ -38,7 +38,7 @@ index 670017490..d8492e05d 100644
insertTime: t("Current time"),
insertDateTime: t("Current date and time"),
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
index 239a8e7a6..c0dc3b3bd 100644
index 5a4d4a079..e43c4fc29 100644
--- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts
@@ -53,6 +53,8 @@ declare module "styled-components" {
@ -51,10 +51,10 @@ index 239a8e7a6..c0dc3b3bd 100644
interface Colors {
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index 540c2f936..a9863bdca 100644
index c61b0fdb4..6ea2a6798 100644
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
@@ -515,6 +515,20 @@ h6 {
@@ -635,6 +635,20 @@ h6 {
}
}
@ -113,10 +113,10 @@ index 158a0dfb9..f297c3433 100644
component = <InfoIcon color="currentColor" />;
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index 367e8ab9c..70066ddfd 100644
index f28d552c0..1e6490890 100644
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
@@ -87,6 +87,8 @@ export const base = {
@@ -88,6 +88,8 @@ export const base = {
noticeTipText: colors.almostBlack,
noticeWarningBackground: "#d73a49",
noticeWarningText: colors.almostBlack,
@ -125,11 +125,11 @@ index 367e8ab9c..70066ddfd 100644
breakpoints,
};
@@ -208,6 +210,7 @@ export const dark = {
@@ -213,6 +215,7 @@ export const dark = {
noticeInfoText: colors.white,
noticeTipText: colors.white,
noticeWarningText: colors.white,
+ noticeBibleText: colors.white,
progressBarBackground: colors.slate,
scrollbarBackground: colors.black,
scrollbarThumb: colors.lightBlack,
scrollbarThumb: colors.lightBlack,

16
sources/patches/app-05-login.patch
View file

@ -1,8 +1,8 @@
diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx
index b5bb854ad..d29e958be 100644
index 7e124c124..0deb00a85 100644
--- a/app/scenes/Login/AuthenticationProvider.tsx
+++ b/app/scenes/Login/AuthenticationProvider.tsx
@@ -67,7 +67,7 @@ function AuthenticationProvider(props: Props) {
@@ -91,7 +91,7 @@ function AuthenticationProvider(props: Props) {
<InputLarge
type="email"
name="email"
@ -11,7 +11,7 @@ index b5bb854ad..d29e958be 100644
value={email}
onChange={handleChangeEmail}
disabled={isSubmitting}
@@ -76,12 +76,12 @@ function AuthenticationProvider(props: Props) {
@@ -100,12 +100,12 @@ function AuthenticationProvider(props: Props) {
short
/>
<ButtonLarge type="submit" disabled={isSubmitting}>
@ -26,7 +26,7 @@ index b5bb854ad..d29e958be 100644
</ButtonLarge>
)}
</Form>
@@ -106,7 +106,7 @@ function AuthenticationProvider(props: Props) {
@@ -120,7 +120,7 @@ function AuthenticationProvider(props: Props) {
icon={<AuthLogo providerName={id} />}
fullwidth
>
@ -36,19 +36,19 @@ index b5bb854ad..d29e958be 100644
})}
</ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 81adf346e..e4bb23585 100644
index 168165b08..9e1ec2f5d 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -188,7 +188,7 @@ function Login({ children }: Props) {
@@ -214,7 +214,7 @@ function Login({ children }: Props) {
) : (
<>
<StyledHeading as="h2" centered>
- {t("Login to {{ authProviderName }}", {
+ {t("Bienvenue sur Anthropologie Biblique", {
authProviderName: config.name || "Outline",
authProviderName: config.name || env.APP_NAME,
})}
</StyledHeading>
@@ -206,7 +206,7 @@ function Login({ children }: Props) {
@@ -232,7 +232,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && (
<>
<Note>

13
sources/patches/app-06-logo.patch
View file

@ -1,13 +0,0 @@
diff --git a/app/components/OutlineLogo.tsx b/app/components/OutlineLogo.tsx
index 81eb48551..1fee69cd9 100644
--- a/app/components/OutlineLogo.tsx
+++ b/app/components/OutlineLogo.tsx
@@ -16,7 +16,7 @@ function OutlineLogo({ size = 32, fill = "#333", className }: Props) {
xmlns="http://www.w3.org/2000/svg"
className={className}
>
- <path d="M32,57.6 L32,59.1606101 C32,61.3697491 30.209139,63.1606101 28,63.1606101 C27.3130526,63.1606101 26.6376816,62.9836959 26.038955,62.6469122 L2.03895504,49.1469122 C0.779447116,48.438439 -4.3614532e-15,47.1057033 -7.10542736e-15,45.6606101 L-7.10542736e-15,18.3393899 C-7.28240024e-15,16.8942967 0.779447116,15.561561 2.03895504,14.8530878 L26.038955,1.35308779 C27.9643866,0.270032565 30.4032469,0.952913469 31.4863021,2.87834498 C31.8230858,3.47707155 32,4.15244252 32,4.83938994 L32,6.4 L34.8506085,5.54481746 C36.9665799,4.91002604 39.1965137,6.11075966 39.8313051,8.22673106 C39.9431692,8.59961116 40,8.98682435 40,9.3761226 L40,11 L43.5038611,10.5620174 C45.6959408,10.2880074 47.6951015,11.8429102 47.9691115,14.0349899 C47.9896839,14.1995692 48,14.3652688 48,14.5311289 L48,49.4688711 C48,51.6780101 46.209139,53.4688711 44,53.4688711 C43.8341399,53.4688711 43.6684404,53.458555 43.5038611,53.4379826 L40,53 L40,54.6238774 C40,56.8330164 38.209139,58.6238774 36,58.6238774 C35.6107017,58.6238774 35.2234886,58.5670466 34.8506085,58.4551825 L32,57.6 Z M32,53.4238774 L36,54.6238774 L36,9.3761226 L32,10.5761226 L32,53.4238774 Z M40,15.0311289 L40,48.9688711 L44,49.4688711 L44,14.5311289 L40,15.0311289 Z M5.32907052e-15,44.4688711 L5.32907052e-15,19.5311289 L3.55271368e-15,44.4688711 Z M4,18.3393899 L4,45.6606101 L28,59.1606101 L28,4.83938994 L4,18.3393899 Z M8,21 L12,19 L12,45 L8,43 L8,21 Z" />
+ <path d="m 53.031478,29.104847 c 3.23011,-1.643389 4.816831,-4.02347 4.816831,-7.196911 0,-2.550087 -0.906697,-4.646826 -2.720092,-6.233546 -1.870064,-1.64339 -4.250145,-2.493419 -7.140244,-2.493419 -3.683459,0 -6.516889,1.076704 -8.556958,3.23011 -1.756727,1.870064 -3.116773,4.08014 -3.910133,6.686895 -0.793361,2.663424 -1.190041,6.176877 -1.190041,10.483691 v 21.874079 c 0,4.080139 -0.39668,6.913569 -1.190041,8.556958 h 7.933604 c 0.736692,-1.870064 1.133372,-4.703494 1.133372,-8.556958 v -3.740128 c 1.643389,1.020035 3.400116,1.473384 5.27018,1.473384 3.400116,0 6.290214,-1.133372 8.670295,-3.400116 2.776762,-2.663424 4.136808,-6.06354 4.136808,-10.200348 0,-5.440185 -2.43675,-8.89697 -7.310249,-10.370353 z M 42.207776,24.344685 c 0,-3.23011 0.226675,-5.553522 0.736692,-6.913569 0.566686,-1.700058 1.700058,-2.493418 3.343447,-2.493418 1.246709,0 2.210076,0.963366 2.890099,2.890098 0.566686,1.586721 0.79336,3.513454 0.79336,5.723529 0,0.963366 -0.05667,1.926732 -0.283343,2.83343 -0.283343,1.19004 -0.623354,1.813395 -1.020035,1.813395 l -2.550087,-0.510017 c -1.813395,0 -2.720092,0.510017 -2.720092,1.530052 0,0.963366 0.736691,1.473383 2.266744,1.473383 l 2.436749,-0.510017 c 0.623355,0 1.360047,0.736692 2.096738,2.096738 1.133372,2.04007 1.700058,4.590156 1.700058,7.820267 0,4.02347 -0.283343,6.800231 -0.850029,8.443621 -0.680023,1.926732 -2.040069,2.890098 -4.02347,2.890098 -2.153407,0 -3.796796,-1.020035 -4.816831,-3.116773 z M 10.753444,40.061886 Q 9.9672842,39.480812 9.2153052,39.173184 8.4975071,38.831375 7.4720813,38.831375 q -1.0937875,0 -2.5635646,0.410171 Q 3.4729206,39.617535 1.2169838,40.403695 0.97771772,40.164429 0.70427084,39.754259 0.46500481,39.344088 0.36246223,38.899737 1.4220689,38.079396 2.7209416,37.156513 4.0539952,36.23363 5.592134,35.276566 4.3958038,33.977693 3.5754632,32.883906 2.7551225,31.790118 2.2424096,30.867235 1.7296967,29.910171 1.4904306,29.021468 1.2853455,28.132766 1.2853455,27.244064 q 0,-1.093788 0.3076277,-2.255937 0.3418086,-1.19633 1.0254259,-2.563565 0.717798,-1.401415 1.8115856,-3.007916 Q 5.5237722,17.775965 7.061911,15.759294 6.1048469,14.733868 5.2503253,13.879347 4.4299847,13.024825 3.7805483,12.238666 3.1652928,11.452506 2.7893034,10.734708 2.4474947,9.9827288 2.4474947,9.1623881 q 0,-0.991245 0.4443512,-1.9141282 Q 3.6780057,5.6075786 4.5325273,4.1378015 5.4212296,2.6338437 6.309932,1.0957049 6.6859215,0.99316233 7.1644536,1.0615241 q 0.478532,0.034181 0.8545215,0.2050851 -0.034181,0.2734469 -0.034181,0.5810747 0,0.3076277 0,0.5468937 0,0.7177981 0.1025426,1.4014153 0.1025426,0.6494364 0.3759895,1.3330536 0.2734469,0.6836172 0.7519789,1.4355962 0.4785321,0.7519789 1.2646919,1.6406813 1.435596,1.5381387 3.042097,3.17882 1.640681,1.606501 3.315543,3.213001 1.674862,1.57232 3.349725,3.110458 1.674862,1.503958 3.213001,2.905374 1.093787,-1.16215 1.845766,-2.050852 0.78616,-0.922883 1.264692,-1.606501 0.512713,-0.683617 0.717798,-1.230511 0.239266,-0.546893 0.239266,-1.059606 0,-0.78616 -0.546894,-1.469777 Q 26.408278,12.477932 25.143586,11.384144 24.118161,10.495442 23.468724,9.8801862 22.819288,9.2649307 22.443298,8.7863986 22.10149,8.2736857 21.964766,7.8635154 21.862224,7.4533451 21.862224,6.974813 q 0,-0.8203407 0.991245,-2.2901177 1.025426,-1.5039579 3.486448,-3.75989469 0.273446,-0.0683617 0.717798,0.0683617 0.444351,0.13672349 0.786159,0.30762779 -0.03418,0.3418086 -0.06836,0.5810746 0,0.239266 0,0.4443512 0,0.3759895 0.102542,0.6836172 0.102543,0.3076278 0.410171,0.6836173 0.307627,0.3418086 0.854521,0.8545215 0.546894,0.5127129 1.435596,1.2988727 1.98249,1.7774048 2.76865,2.8370115 0.78616,1.0254258 0.78616,1.8799469 0,0.649437 -0.307628,1.606501 -0.273447,0.957064 -1.19633,2.39266 -0.922883,1.401415 -2.631926,3.383905 -1.674863,1.98249 -4.477693,4.682778 1.469777,1.333054 2.495203,2.324299 1.059606,0.957064 1.811585,1.674862 0.751979,0.717798 1.264692,1.230511 0.546894,0.512713 0.991245,0.922883 1.333054,1.230511 2.050852,2.221756 0.717798,0.991245 0.717798,1.777405 0,0.615256 -0.273447,1.264692 -0.683617,1.572319 -1.298873,3.076277 -0.615255,1.503958 -1.264692,3.17882 -0.854521,0.06836 -1.503957,-0.102542 -0.512713,-1.367235 -1.230511,-2.529384 -0.683618,-1.162149 -1.503958,-2.187575 -0.78616,-1.025426 -1.674862,-1.948309 -0.888703,-0.922883 -1.777405,-1.811586 -1.811586,-1.777404 -3.930799,-3.759894 -2.085033,-1.98249 -4.135884,-3.862438 -2.050852,-1.879947 -3.896619,-3.520628 -1.811585,-1.640682 -3.1104579,-2.76865 -1.5039579,1.98249 -2.0166708,3.418086 -0.4785321,1.401415 -0.4785321,2.666107 0,1.025426 0.4443512,2.085033 0.4785321,1.059606 1.469777,2.324298 1.0254259,1.264692 2.6319266,2.802831 1.6065,1.538139 3.930799,3.58899 0.06836,0.170905 0,0.341809 z" />
</svg>
);
}