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

Updates

Browse source
This commit is contained in:
Limezy 2024-05-06 14:41:42 +07:00
parent 61df4d3f4d
commit d33e56bb74
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Outline"
description.en = "Wiki and knowledge base for teams"
description.fr = "Wiki et base de connaissances pour les équipes"
version = "0.75.0~ynh2"
version = "0.76.1~ynh1"
maintainers = ["Raoul de Limezy"]
@ -55,8 +55,8 @@ ram.runtime = "50M"
[resources]
[resources.sources.main]
url = "https://github.com/outline/outline/archive/2c9b01391fa12ebfd65dc01ec33bbb4941ef23bf.zip"
sha256 = "1bf8ef7fdac470ed0faeefd9575ffbac1f12d623e89d9ee244b2f83788d92933"
url = "https://github.com/outline/outline/archive/86abd274b0865a4453bd5245392a0a042e68931b.zip"
sha256 = "65cd3b1d4420cd4ae1f50345b45c89ede2d75b377576cdc6d2db48d5f24c6c4c"
[resources.system_user]
allow_email = true

45
sources/patches/diff.txt
View file

@ -41,10 +41,10 @@ index 301c2610d..1e6917bd8 100644
name: "separator",
},
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
index 6a73e6750..15b74aa9e 100644
index cfbd81bcd..683fa6883 100644
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
@@ -81,6 +81,8 @@ export default function useDictionary() {
@@ -83,6 +83,8 @@ export default function useDictionary() {
warningNotice: t("Warning notice"),
success: t("Success"),
successNotice: t("Success notice"),
@ -54,10 +54,10 @@ index 6a73e6750..15b74aa9e 100644
insertTime: t("Current time"),
insertDateTime: t("Current date and time"),
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index a231a90ee..67684d36d 100644
index 094c9dafb..a749e8e6a 100644
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
@@ -532,11 +532,6 @@ class DocumentScene extends React.Component<Props> {
@@ -547,11 +547,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
</React.Suspense>
</MaxWidth>
@ -70,7 +70,7 @@ index a231a90ee..67684d36d 100644
{!isShare && (
<Footer>
diff --git a/app/scenes/Login/components/AuthenticationProvider.tsx b/app/scenes/Login/components/AuthenticationProvider.tsx
index 5d564453d..9e3c5b55b 100644
index 0eede84bd..2da7f4438 100644
--- a/app/scenes/Login/components/AuthenticationProvider.tsx
+++ b/app/scenes/Login/components/AuthenticationProvider.tsx
@@ -70,7 +70,7 @@ function AuthenticationProvider(props: Props) {
@ -107,10 +107,10 @@ index 5d564453d..9e3c5b55b 100644
})}
</ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 9a9650b48..5357d5cf5 100644
index 2f486c827..bebfa31ae 100644
--- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx
@@ -264,7 +264,7 @@ function Login({ children }: Props) {
@@ -261,7 +261,7 @@ function Login({ children }: Props) {
) : (
<>
<StyledHeading as="h2" centered>
@ -119,7 +119,7 @@ index 9a9650b48..5357d5cf5 100644
authProviderName: config.name || env.APP_NAME,
})}
</StyledHeading>
@@ -282,7 +282,7 @@ function Login({ children }: Props) {
@@ -279,7 +279,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && (
<>
<Note>
@ -142,17 +142,17 @@ index be368444f..ecfcae00c 100644
interface Colors {
diff --git a/package.json b/package.json
index e0d3f56ea..fcd1ce270 100644
index 872709a30..52ef90de6 100644
--- a/package.json
+++ b/package.json
@@ -160,6 +160,7 @@
"pg-tsquery": "^8.4.1",
@@ -165,6 +165,7 @@
"pluralize": "^8.0.0",
"png-chunks-extract": "^1.0.0",
"polished": "^4.3.1",
+ "passport-req": "^0.1.1",
"polished": "^4.2.2",
"prosemirror-codemark": "^0.4.2",
"prosemirror-commands": "^1.5.2",
"prosemirror-dropcursor": "^1.8.1",
diff --git a/plugins/req/plugin.json b/plugins/req/plugin.json
new file mode 100644
index 000000000..ae7c40333
@ -163,6 +163,15 @@ index 000000000..ae7c40333
+ "name": "visiteur",
+ "description": "Adds an req compatible authentication provider."
+}
diff --git a/plugins/req/server/.babelrc b/plugins/req/server/.babelrc
new file mode 100644
index 000000000..c87001bc4
--- /dev/null
+++ b/plugins/req/server/.babelrc
@@ -0,0 +1,3 @@
+{
+ "extends": "../../../server/.babelrc"
+}
diff --git a/plugins/req/server/auth/req.ts b/plugins/req/server/auth/req.ts
new file mode 100644
index 000000000..bc03fc6d3
@ -253,10 +262,10 @@ index f53e44b6b..bcf56efca 100644
}
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
index bdebcc6c0..ca670a66f 100644
index ba7386cb7..caf852129 100644
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
@@ -886,6 +886,20 @@ h6 {
@@ -894,6 +894,20 @@ h6 {
}
}
@ -307,7 +316,7 @@ index bd976e69b..9ee40b8d5 100644
component = <InfoIcon />;
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
index 5f10aa263..137f125c9 100644
index 7ade24ab4..bfa263c64 100644
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
@@ -31,6 +31,7 @@ const defaultColors: Colors = {
@ -336,10 +345,10 @@ index 5f10aa263..137f125c9 100644
scrollbarBackground: colors.black,
scrollbarThumb: colors.lightBlack,
diff --git a/yarn.lock b/yarn.lock
index c47df111a..3d7a8e387 100644
index 5c04955ac..161b0dce8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10290,6 +10290,14 @@ passport-oauth@1.0.x:
@@ -10663,6 +10663,14 @@ passport-oauth@1.0.x:
passport-oauth1 "1.x.x"
passport-oauth2 "1.x.x"
@ -354,7 +363,7 @@ index c47df111a..3d7a8e387 100644
passport-slack-oauth2@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4"
@@ -10320,6 +10328,14 @@ passport@^0.7.0:
@@ -10693,6 +10701,14 @@ passport@^0.7.0:
pause "0.0.1"
utils-merge "^1.0.1"