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

First test

Browse source
This commit is contained in:
Limezy 2022-11-12 23:21:10 +07:00
parent e1e648452b
commit 71eaa8ba02
8 changed files with 67 additions and 65 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/dccf86c491cd85c3e2a9427e72836e6e2e78cb19.zip
SOURCE_SUM=930bc83b1551689b700299842397bb61c96e087431b425795fa42b9d29921def
SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.67.0.zip
SOURCE_SUM=2fc6f8af630f53ed3be6d562cd6dea517e4c572debd663305e1ed53945d76797
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.66.0~ynh2",
"version": "0.67.0~ynh1",
"url": "www.getoutline.com",
"upstream": {
"license": "BUSL-1.1",

14
sources/patches/app-01-branding.patch
View file

@ -1,14 +0,0 @@
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index 9d86f478..25b45653 100644
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
@@ -617,9 +617,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
</React.Suspense>
</MaxWidth>
- {isShare && !parseDomain(window.location.origin).custom && (
- <Branding href="//www.getoutline.com?ref=sharelink" />
- )}
</Container>
</Background>
{!isShare && (

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

@ -1,5 +1,5 @@
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index 669d0038..ccc5c047 100644
index 669d00388..ccc5c047f 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -121,6 +121,7 @@ export class Mailer {

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

@ -1,6 +1,6 @@
diff --git a/server/routes/auth/providers/req.ts b/server/routes/auth/providers/req.ts
new file mode 100644
index 00000000..be344d2e
index 000000000..be344d2e2
--- /dev/null
+++ b/server/routes/auth/providers/req.ts
@@ -0,0 +1,62 @@
@ -67,17 +67,17 @@ index 00000000..be344d2e
+
+export default router;
diff --git a/yarn.lock b/yarn.lock
index 0bc83b9b..06e1b385 100644
index ef3b53a5f..e5c12935e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11790,6 +11790,14 @@ passport-oauth@1.0.x:
@@ -11822,6 +11822,14 @@ passport-oauth@1.0.x:
passport-oauth1 "1.x.x"
passport-oauth2 "1.x.x"
+passport-req@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/passport-req/-/passport-req-0.1.1.tgz#451bff1500b3d464a768d42f0762328a21236a18"
+ integrity sha1-RRv/FQCz1GSnaNQvB2IyiiEjahg=
+ integrity sha512-9qmM0vD5v7jYLWxezNNCleOw+8IkVAuvOwQ6NJaUuJkdFJTR1KatXH1i5MxWgffx+libLWYLRUPtc6GHOmn+6w==
+ dependencies:
+ passport "~0.1.1"
+ pkginfo "0.2.x"
@ -85,15 +85,30 @@ index 0bc83b9b..06e1b385 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"
diff --git a/package.json b/package.json
index ff45e246..a5837c23 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",
+ "passport-req": "^0.1.1",
"passport-slack-oauth2": "^1.1.1",
"pg": "^8.5.1",
"pg-hstore": "^2.3.4",
@@ -11844,6 +11852,14 @@ passport@^0.6.0:
pause "0.0.1"
utils-merge "^1.0.1"
+passport@~0.1.1:
+ version "0.1.18"
+ resolved "https://registry.yarnpkg.com/passport/-/passport-0.1.18.tgz#c8264479dcb6414cadbb66752d12b37e0b6525a1"
+ integrity sha512-qteYojKG/qth7UBbbGU7aqhe5ndJs6YaUkH2B6+7FWQ0OeyYmWknzOATpMhdoSTDcLLliq9n4Fcy1mGs80iUMw==
+ dependencies:
+ pause "0.0.1"
+ pkginfo "0.2.x"
+
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:
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"

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

@ -1,30 +1,31 @@
diff --git a/app/editor/menus/block.ts b/app/editor/menus/block.ts
index 9a6fbe7d..26fac655 100644
--- a/app/editor/menus/block.ts
+++ b/app/editor/menus/block.ts
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
index 143c28309..26d7d6d06 100644
--- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx
@@ -18,6 +18,7 @@ import {
AttachmentIcon,
ClockIcon,
CalendarIcon,
+ BookmarkedIcon,
} from "outline-icons";
import { MenuItem } from "@shared/editor/types";
import { Dictionary } from "~/hooks/useDictionary";
@@ -168,5 +169,12 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
keywords: "notice card suggestion",
attrs: { style: "tip" },
},
+ {
+ name: "container_notice",
+ title: dictionary.bibleNotice,
import * as React from "react";
import styled from "styled-components";
@@ -176,6 +177,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
{
name: "container_notice",
title: dictionary.tipNotice,
+ icon: BookmarkedIcon,
+ keywords: "notice card suggestion",
+ attrs: { style: "bible" },
+ },
];
}
+ {
+ name: "container_notice",
+ title: dictionary.bibleNotice,
icon: StarredIcon,
keywords: "notice card suggestion",
attrs: { style: "tip" },
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
index 67001749..d8492e05 100644
index 670017490..d8492e05d 100644
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
@@ -75,6 +75,8 @@ export default function useDictionary() {
@ -37,10 +38,10 @@ index 67001749..d8492e05 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 c8e571d5..7d8aef81 100644
index 239a8e7a6..c0dc3b3bd 100644
--- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts
@@ -54,6 +54,8 @@ declare module "styled-components" {
@@ -53,6 +53,8 @@ declare module "styled-components" {
noticeTipText: string;
noticeWarningBackground: string;
noticeWarningText: string;
@ -50,10 +51,10 @@ index c8e571d5..7d8aef81 100644
interface Colors {
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index e1ba4bfa..f6725fb5 100644
index 540c2f936..a9863bdca 100644
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
@@ -511,6 +511,20 @@ h6 {
@@ -515,6 +515,20 @@ h6 {
}
}
@ -75,7 +76,7 @@ index e1ba4bfa..f6725fb5 100644
margin: 0;
padding-left: 1.5em;
diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx
index 158a0dfb..f297c343 100644
index 158a0dfb9..f297c3433 100644
--- a/shared/editor/nodes/Notice.tsx
+++ b/shared/editor/nodes/Notice.tsx
@@ -1,5 +1,5 @@
@ -112,7 +113,7 @@ index 158a0dfb..f297c343 100644
component = <InfoIcon color="currentColor" />;
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index 3ff5c7cf..fb4804ec 100644
index 367e8ab9c..70066ddfd 100644
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
@@ -87,6 +87,8 @@ export const base = {
@ -124,11 +125,11 @@ index 3ff5c7cf..fb4804ec 100644
breakpoints,
};
@@ -206,6 +208,7 @@ export const dark = {
@@ -208,6 +210,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,

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

@ -1,5 +1,5 @@
diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx
index b5bb854a..d29e958b 100644
index b5bb854ad..d29e958be 100644
--- a/app/scenes/Login/AuthenticationProvider.tsx
+++ b/app/scenes/Login/AuthenticationProvider.tsx
@@ -67,7 +67,7 @@ function AuthenticationProvider(props: Props) {
@ -36,19 +36,19 @@ index b5bb854a..d29e958b 100644
})}
</ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index e08e120c..f9e03f21 100644
index 81adf346e..1287336ae 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -180,7 +180,7 @@ function Login({ children }: Props) {
@@ -188,7 +188,7 @@ function Login({ children }: Props) {
) : (
<>
<StyledHeading centered>
<StyledHeading as="h2" centered>
- {t("Login to {{ authProviderName }}", {
+ {t("Bienvenue sur {{ authProviderName }}", {
authProviderName: config.name || "Outline",
})}
</StyledHeading>
@@ -198,7 +198,7 @@ function Login({ children }: Props) {
@@ -206,7 +206,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && (
<>
<Note>

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

@ -1,5 +1,5 @@
diff --git a/app/components/OutlineLogo.tsx b/app/components/OutlineLogo.tsx
index 81eb4855..1fee69cd 100644
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) {
@ -10,4 +10,4 @@ index 81eb4855..1fee69cd 100644
+ <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>
);
}
}