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"

47
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,7 +125,7 @@ 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,

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>

2
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) {