From 192647682e94bb75042d7dfb9bc8d7baf02d3dad Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 13 Nov 2022 13:57:23 +0700 Subject: [PATCH 01/10] v0.67.0 --- sources/patches/app-03-visitor.patch | 126 ------------------------- sources/patches/app-04-bible.patch | 135 --------------------------- sources/patches/app-05-login.patch | 59 ------------ sources/patches/app-06-logo.patch | 13 --- 4 files changed, 333 deletions(-) delete mode 100644 sources/patches/app-03-visitor.patch delete mode 100644 sources/patches/app-04-bible.patch delete mode 100644 sources/patches/app-05-login.patch delete mode 100644 sources/patches/app-06-logo.patch diff --git a/sources/patches/app-03-visitor.patch b/sources/patches/app-03-visitor.patch deleted file mode 100644 index 256abb5..0000000 --- a/sources/patches/app-03-visitor.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/server/routes/auth/providers/req.ts b/server/routes/auth/providers/req.ts -new file mode 100644 -index 000000000..be344d2e2 ---- /dev/null -+++ b/server/routes/auth/providers/req.ts -@@ -0,0 +1,62 @@ -+import passport from "@outlinewiki/koa-passport"; -+import Router from "koa-router"; -+import { capitalize } from "lodash"; -+import { Strategy as ReqStrategy } from "passport-req"; -+import accountProvisioner from "@server/commands/accountProvisioner"; -+import env from "@server/env"; -+import passportMiddleware from "@server/middlewares/passport"; -+import { StateStore } from "@server/utils/passport"; -+ -+const router = new Router(); -+const providerName = "req"; -+ -+export const config = { -+ name: "visiteur", -+ enabled: true, -+}; -+ -+if (true) { -+ passport.use( -+ new ReqStrategy( -+ async function (req,done) { -+ try { -+ const domain = "domain.tld"; -+ const subdomain = domain.split(".")[0]; -+ const teamName = capitalize(subdomain); -+ const name = "visiteur"; -+ const email = "visiteur@anthropologiebiblique.fr"; -+ const result = await accountProvisioner({ -+ ip: req.ip, -+ team: { -+ name: teamName, -+ domain, -+ subdomain, -+ }, -+ user: { -+ name: name, -+ email: email, -+ avatarUrl: null, -+ }, -+ authenticationProvider: { -+ name: providerName, -+ providerId: domain, -+ }, -+ authentication: { -+ providerId: "1234", -+ accessToken: null, -+ refreshToken: null, -+ scopes: [], -+ }, -+ }); -+ return done(null, result.user, result); -+ } catch (err) { -+ return done(err, null); -+ } -+ } -+ ) -+ ); -+ -+ router.get("req", passportMiddleware(providerName)); -+} -+ -+export default router; -diff --git a/yarn.lock b/yarn.lock -index ef3b53a5f..e5c12935e 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -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 sha512-9qmM0vD5v7jYLWxezNNCleOw+8IkVAuvOwQ6NJaUuJkdFJTR1KatXH1i5MxWgffx+libLWYLRUPtc6GHOmn+6w== -+ dependencies: -+ passport "~0.1.1" -+ pkginfo "0.2.x" -+ - 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: - 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" -diff --git a/package.json b/package.json -index aa6796368..43617af55 100644 ---- a/package.json -+++ b/package.json -@@ -145,6 +145,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", diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch deleted file mode 100644 index bbafb29..0000000 --- a/sources/patches/app-04-bible.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 143c28309..cd6830b12 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 * as React from "react"; - import styled from "styled-components"; -@@ -180,6 +181,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { - keywords: "notice card suggestion", - attrs: { style: "tip" }, - }, -+ { -+ name: "container_notice", -+ title: dictionary.bibleNotice, -+ icon: BookmarkedIcon, -+ keywords: "notice card suggestion", -+ attrs: { style: "bible" }, -+ }, - { - name: "separator", - }, -diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 670017490..d8492e05d 100644 ---- a/app/hooks/useDictionary.ts -+++ b/app/hooks/useDictionary.ts -@@ -75,6 +75,8 @@ export default function useDictionary() { - showSource: t("Show source"), - warning: t("Warning"), - warningNotice: t("Warning notice"), -+ bible: t("Bible"), -+ bibleNotice: t("Bible quote"), - insertDate: t("Current date"), - 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 ---- a/app/typings/styled-components.d.ts -+++ b/app/typings/styled-components.d.ts -@@ -53,6 +53,8 @@ declare module "styled-components" { - noticeTipText: string; - noticeWarningBackground: string; - noticeWarningText: string; -+ noticeBibleBackground: string; -+ noticeBibleText: string; - } - - interface Colors { -diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index 540c2f936..a9863bdca 100644 ---- a/shared/editor/components/Styles.ts -+++ b/shared/editor/components/Styles.ts -@@ -515,6 +515,20 @@ h6 { - } - } - -+.notice-block.bible { -+ background: ${transparentize(0.9, props.theme.noticeBibleBackground)}; -+ border-left: 4px solid ${props.theme.noticeBibleBackground}; -+ color: ${props.theme.noticeBibleText}; -+ -+ .icon { -+ color: ${props.theme.noticeBibleBackground}; -+ } -+ -+ a { -+ color: ${props.theme.noticeBibleText}; -+ } -+} -+ - blockquote { - margin: 0; - padding-left: 1.5em; -diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx -index 158a0dfb9..f297c3433 100644 ---- a/shared/editor/nodes/Notice.tsx -+++ b/shared/editor/nodes/Notice.tsx -@@ -1,5 +1,5 @@ - import Token from "markdown-it/lib/token"; --import { WarningIcon, InfoIcon, StarredIcon } from "outline-icons"; -+import { WarningIcon, InfoIcon, StarredIcon, BookmarkedIcon } from "outline-icons"; - import { wrappingInputRule } from "prosemirror-inputrules"; - import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model"; - import * as React from "react"; -@@ -15,6 +15,7 @@ export default class Notice extends Node { - info: this.options.dictionary.info, - warning: this.options.dictionary.warning, - tip: this.options.dictionary.tip, -+ bible: this.options.dictionary.bible, - }); - } - -@@ -47,6 +48,8 @@ export default class Notice extends Node { - ? "tip" - : dom.className.includes("warning") - ? "warning" -+ : dom.className.includes("bible") -+ ? "bible" - : undefined, - }), - }, -@@ -75,6 +78,8 @@ export default class Notice extends Node { - component = ; - } else if (node.attrs.style === "warning") { - component = ; -+ } else if (node.attrs.style === "bible") { -+ component = ; - } else { - component = ; - } -diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index 367e8ab9c..70066ddfd 100644 ---- a/shared/styles/theme.ts -+++ b/shared/styles/theme.ts -@@ -87,6 +87,8 @@ export const base = { - noticeTipText: colors.almostBlack, - noticeWarningBackground: "#d73a49", - noticeWarningText: colors.almostBlack, -+ noticeBibleBackground: "#996633", -+ noticeBibleText: colors.almostBlack, - breakpoints, - }; - -@@ -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, diff --git a/sources/patches/app-05-login.patch b/sources/patches/app-05-login.patch deleted file mode 100644 index 900b2fd..0000000 --- a/sources/patches/app-05-login.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx -index b5bb854ad..d29e958be 100644 ---- a/app/scenes/Login/AuthenticationProvider.tsx -+++ b/app/scenes/Login/AuthenticationProvider.tsx -@@ -67,7 +67,7 @@ function AuthenticationProvider(props: Props) { - - -- {t("Sign In")} → -+ {t("S'identifier")} → - - - ) : ( - } fullwidth> -- {t("Continue with Email")} -+ {t("Accès membre (email)")} - - )} - -@@ -106,7 +106,7 @@ function AuthenticationProvider(props: Props) { - icon={} - fullwidth - > -- {t("Continue with {{ authProviderName }}", { -+ {t("Accès {{ authProviderName }}", { - authProviderName: name, - })} - -diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 81adf346e..e4bb23585 100644 ---- a/app/scenes/Login/index.tsx -+++ b/app/scenes/Login/index.tsx -@@ -188,7 +188,7 @@ function Login({ children }: Props) { - ) : ( - <> - -- {t("Login to {{ authProviderName }}", { -+ {t("Bienvenue sur Anthropologie Biblique", { - authProviderName: config.name || "Outline", - })} - -@@ -206,7 +206,7 @@ function Login({ children }: Props) { - {hasMultipleProviders && ( - <> - -- {t("You signed in with {{ authProviderName }} last time.", { -+ {t("Vous vous êtes authentifié avec l'accès {{ authProviderName }} la dernière fois.", { - authProviderName: defaultProvider.name, - })} - diff --git a/sources/patches/app-06-logo.patch b/sources/patches/app-06-logo.patch deleted file mode 100644 index fa26237..0000000 --- a/sources/patches/app-06-logo.patch +++ /dev/null @@ -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} - > -- -+ - - ); - } From e32232935d0ca0922d897b59b3098e71458b20e0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Nov 2022 05:58:25 +0000 Subject: [PATCH 02/10] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e70091c..d459ad0 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Shipped version:** 0.66.0~ynh1 - +**Shipped version:** 0.67.0~ynh1 **Demo:** https://app.getoutline.com/create diff --git a/README_fr.md b/README_fr.md index 52a6af1..9434d99 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,8 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Version incluse :** 0.66.0~ynh1 - +**Version incluse :** 0.67.0~ynh1 **Démo :** https://app.getoutline.com/create From ca821cc9ce961f629112a201a938a892c0acf458 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 28 Jan 2023 15:48:31 +0700 Subject: [PATCH 03/10] Remove anthropologiebiblique patches --- sources/patches/app-03-visitor.patch | 126 ------------------------- sources/patches/app-04-bible.patch | 135 --------------------------- sources/patches/app-05-login.patch | 59 ------------ 3 files changed, 320 deletions(-) delete mode 100644 sources/patches/app-03-visitor.patch delete mode 100644 sources/patches/app-04-bible.patch delete mode 100644 sources/patches/app-05-login.patch diff --git a/sources/patches/app-03-visitor.patch b/sources/patches/app-03-visitor.patch deleted file mode 100644 index 7aeb1a7..0000000 --- a/sources/patches/app-03-visitor.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/server/routes/auth/providers/req.ts b/server/routes/auth/providers/req.ts -new file mode 100644 -index 000000000..be344d2e2 ---- /dev/null -+++ b/server/routes/auth/providers/req.ts -@@ -0,0 +1,62 @@ -+import passport from "@outlinewiki/koa-passport"; -+import Router from "koa-router"; -+import { capitalize } from "lodash"; -+import { Strategy as ReqStrategy } from "passport-req"; -+import accountProvisioner from "@server/commands/accountProvisioner"; -+import env from "@server/env"; -+import passportMiddleware from "@server/middlewares/passport"; -+import { StateStore } from "@server/utils/passport"; -+ -+const router = new Router(); -+const providerName = "req"; -+ -+export const config = { -+ name: "visiteur", -+ enabled: true, -+}; -+ -+if (true) { -+ passport.use( -+ new ReqStrategy( -+ async function (req,done) { -+ try { -+ const domain = "domain.tld"; -+ const subdomain = domain.split(".")[0]; -+ const teamName = capitalize(subdomain); -+ const name = "visiteur"; -+ const email = "visiteur@anthropologiebiblique.fr"; -+ const result = await accountProvisioner({ -+ ip: req.ip, -+ team: { -+ name: teamName, -+ domain, -+ subdomain, -+ }, -+ user: { -+ name: name, -+ email: email, -+ avatarUrl: null, -+ }, -+ authenticationProvider: { -+ name: providerName, -+ providerId: domain, -+ }, -+ authentication: { -+ providerId: "1234", -+ accessToken: null, -+ refreshToken: null, -+ scopes: [], -+ }, -+ }); -+ return done(null, result.user, result); -+ } catch (err) { -+ return done(err, null); -+ } -+ } -+ ) -+ ); -+ -+ router.get("req", passportMiddleware(providerName)); -+} -+ -+export default router; -diff --git a/yarn.lock b/yarn.lock -index 67d407ca7..150665e94 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -12100,6 +12100,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 sha512-9qmM0vD5v7jYLWxezNNCleOw+8IkVAuvOwQ6NJaUuJkdFJTR1KatXH1i5MxWgffx+libLWYLRUPtc6GHOmn+6w== -+ dependencies: -+ passport "~0.1.1" -+ pkginfo "0.2.x" -+ - 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" -@@ -12122,6 +12130,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" -@@ -12348,6 +12364,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" -diff --git a/package.json b/package.json -index d64914567..ca674a5cd 100644 ---- a/package.json -+++ b/package.json -@@ -145,6 +145,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.8.0", - "pg-hstore": "^2.3.4", diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch deleted file mode 100644 index 37961d1..0000000 --- a/sources/patches/app-04-bible.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 42269b5e4..f5e5041e3 100644 ---- a/app/editor/menus/block.tsx -+++ b/app/editor/menus/block.tsx -@@ -19,6 +19,7 @@ import { - ClockIcon, - CalendarIcon, - MathIcon, -+ BookmarkedIcon, - } from "outline-icons"; - import * as React from "react"; - import styled from "styled-components"; -@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { - keywords: "notice card suggestion", - attrs: { style: "tip" }, - }, -+ { -+ name: "container_notice", -+ title: dictionary.bibleNotice, -+ icon: BookmarkedIcon, -+ keywords: "notice card suggestion", -+ attrs: { style: "bible" }, -+ }, - { - name: "separator", - }, -diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 5b9196de5..90caf27d7 100644 ---- a/app/hooks/useDictionary.ts -+++ b/app/hooks/useDictionary.ts -@@ -75,6 +75,8 @@ export default function useDictionary() { - showSource: t("Show source"), - warning: t("Warning"), - warningNotice: t("Warning notice"), -+ bible: t("Bible"), -+ bibleNotice: t("Bible quote"), - insertDate: t("Current date"), - 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 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" { - noticeTipText: string; - noticeWarningBackground: string; - noticeWarningText: string; -+ noticeBibleBackground: string; -+ noticeBibleText: string; - } - - interface Colors { -diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index c61b0fdb4..6ea2a6798 100644 ---- a/shared/editor/components/Styles.ts -+++ b/shared/editor/components/Styles.ts -@@ -635,6 +635,20 @@ h6 { - } - } - -+.notice-block.bible { -+ background: ${transparentize(0.9, props.theme.noticeBibleBackground)}; -+ border-left: 4px solid ${props.theme.noticeBibleBackground}; -+ color: ${props.theme.noticeBibleText}; -+ -+ .icon { -+ color: ${props.theme.noticeBibleBackground}; -+ } -+ -+ a { -+ color: ${props.theme.noticeBibleText}; -+ } -+} -+ - blockquote { - margin: 0; - padding-left: 1.5em; -diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx -index 158a0dfb9..f297c3433 100644 ---- a/shared/editor/nodes/Notice.tsx -+++ b/shared/editor/nodes/Notice.tsx -@@ -1,5 +1,5 @@ - import Token from "markdown-it/lib/token"; --import { WarningIcon, InfoIcon, StarredIcon } from "outline-icons"; -+import { WarningIcon, InfoIcon, StarredIcon, BookmarkedIcon } from "outline-icons"; - import { wrappingInputRule } from "prosemirror-inputrules"; - import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model"; - import * as React from "react"; -@@ -15,6 +15,7 @@ export default class Notice extends Node { - info: this.options.dictionary.info, - warning: this.options.dictionary.warning, - tip: this.options.dictionary.tip, -+ bible: this.options.dictionary.bible, - }); - } - -@@ -47,6 +48,8 @@ export default class Notice extends Node { - ? "tip" - : dom.className.includes("warning") - ? "warning" -+ : dom.className.includes("bible") -+ ? "bible" - : undefined, - }), - }, -@@ -75,6 +78,8 @@ export default class Notice extends Node { - component = ; - } else if (node.attrs.style === "warning") { - component = ; -+ } else if (node.attrs.style === "bible") { -+ component = ; - } else { - component = ; - } -diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index f28d552c0..1e6490890 100644 ---- a/shared/styles/theme.ts -+++ b/shared/styles/theme.ts -@@ -88,6 +88,8 @@ export const base = { - noticeTipText: colors.almostBlack, - noticeWarningBackground: "#d73a49", - noticeWarningText: colors.almostBlack, -+ noticeBibleBackground: "#996633", -+ noticeBibleText: colors.almostBlack, - breakpoints, - }; - -@@ -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, \ No newline at end of file diff --git a/sources/patches/app-05-login.patch b/sources/patches/app-05-login.patch deleted file mode 100644 index 04d1af9..0000000 --- a/sources/patches/app-05-login.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/app/scenes/Login/AuthenticationProvider.tsx b/app/scenes/Login/AuthenticationProvider.tsx -index 7e124c124..0deb00a85 100644 ---- a/app/scenes/Login/AuthenticationProvider.tsx -+++ b/app/scenes/Login/AuthenticationProvider.tsx -@@ -91,7 +91,7 @@ function AuthenticationProvider(props: Props) { - - -- {t("Sign In")} → -+ {t("S'identifier")} → - - - ) : ( - } fullwidth> -- {t("Continue with Email")} -+ {t("Accès membre (email)")} - - )} - -@@ -120,7 +120,7 @@ function AuthenticationProvider(props: Props) { - icon={} - fullwidth - > -- {t("Continue with {{ authProviderName }}", { -+ {t("Accès {{ authProviderName }}", { - authProviderName: name, - })} - -diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index 168165b08..9e1ec2f5d 100644 ---- a/app/scenes/Login/index.tsx -+++ b/app/scenes/Login/index.tsx -@@ -214,7 +214,7 @@ function Login({ children }: Props) { - ) : ( - <> - -- {t("Login to {{ authProviderName }}", { -+ {t("Bienvenue sur Anthropologie Biblique", { - authProviderName: config.name || env.APP_NAME, - })} - -@@ -232,7 +232,7 @@ function Login({ children }: Props) { - {hasMultipleProviders && ( - <> - -- {t("You signed in with {{ authProviderName }} last time.", { -+ {t("Vous vous êtes authentifié avec l'accès {{ authProviderName }} la dernière fois.", { - authProviderName: defaultProvider.name, - })} - From da2db1ee7d628d181fe54592ef62c48e034072a0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 Jan 2023 01:38:04 +0000 Subject: [PATCH 04/10] Auto-update README --- README.md | 4 ++-- README_fr.md | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d459ad0..7c1e37e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Outline for YunoHost -[![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Working status](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Working status](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) [![Install Outline with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) *[Lire ce readme en français.](./README_fr.md)* @@ -25,7 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Shipped version:** 0.67.0~ynh1 +**Shipped version:** 0.67.2~ynh1 **Demo:** https://app.getoutline.com/create diff --git a/README_fr.md b/README_fr.md index 9434d99..f51ce32 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,15 @@ It shall NOT be edited by hand. # Outline pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) [![Installer Outline avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Outline rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Outline rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. @@ -25,13 +25,13 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Version incluse :** 0.67.0~ynh1 +**Version incluse :** 0.67.2~ynh1 **Démo :** https://app.getoutline.com/create -## Captures d'écran +## Captures d’écran -![Capture d'écran de Outline](./doc/screenshots/outline_screenshot.png) +![Capture d’écran de Outline](./doc/screenshots/outline_screenshot.png) ## Avertissements / informations importantes @@ -57,10 +57,10 @@ You can then change the user rights by default and/or change the admin user afte ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -76,4 +76,4 @@ ou sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 50336bc0ccef55a7355875cc9777ab3983318ed9 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 14:49:32 +0700 Subject: [PATCH 05/10] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index ebaaf08..5162bc3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/21ce145f67b26cd7c4493258c65b5d1731b23a79.zip -SOURCE_SUM=610604b495a7972fd5140d14d53b8e1b891e9caf0aec53856cbe229f5c76eb77 +SOURCE_URL=https://github.com/outline/outline/archive/f0d9bb4898642ca65bde42c8c53d1a4c6dc72e0d.zip +SOURCE_SUM=0788a176da28b52433a19d7144878ad8c2fad3b2893a22aa69285a1f6c356731 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From 343ee4c9929a352d9a9ce3d1b81dcc100a6fe3dd Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 15:28:27 +0700 Subject: [PATCH 06/10] Update upgrade --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 43593a4..34a204c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,6 +85,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then + ynh_script_progression --message="Cleaning up files..." --weight=1 + # Void and recreate final_path + ynh_secure_remove --file="$final_path" + ynh_exec_warn_less mkdir "$final_path" + ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src From fa48253cc78f4e49522068ba3a32991c8dfc0a9e Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 2 Feb 2023 01:21:31 +0700 Subject: [PATCH 07/10] Delete app-06-logo.patch --- sources/patches/app-06-logo.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 sources/patches/app-06-logo.patch diff --git a/sources/patches/app-06-logo.patch b/sources/patches/app-06-logo.patch deleted file mode 100644 index 08e50cf..0000000 --- a/sources/patches/app-06-logo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/app/components/Icons/OutlineIcon.tsx b/app/components/Icons/OutlineIcon.tsx -index 05fa32927..15c06887b 100644 ---- a/app/components/Icons/OutlineIcon.tsx -+++ b/app/components/Icons/OutlineIcon.tsx -@@ -22,7 +22,7 @@ export default function OutlineIcon({ - viewBox={cover ? "2 2 20 20" : "0 0 24 24"} - version="1.1" - > -- -+ - - ); - } \ No newline at end of file From 5f7444e830c0e9706185260ed5f56f3ed5e953d0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 8 Feb 2023 23:26:10 +0700 Subject: [PATCH 08/10] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a83b23a..7198f84 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", - "website": "www.getoutline.com", + "website": "https://www.getoutline.com", "demo": "https://app.getoutline.com/create", "admindoc": "https://www.getoutline.com/developers", "userdoc": "https://www.getoutline.com/about", From 1a1f8dd20a2da1a9560674f521255ad6327f264d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Feb 2023 16:26:18 +0000 Subject: [PATCH 09/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c1e37e..115ab78 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ You can then change the user rights by default and/or change the admin user afte ## Documentation and resources -* Official app website: +* Official app website: * Official user documentation: * Official admin documentation: * Upstream app code repository: diff --git a/README_fr.md b/README_fr.md index f51ce32..60ed56f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -57,7 +57,7 @@ You can then change the user rights by default and/or change the admin user afte ## Documentations et ressources -* Site officiel de l’app : +* Site officiel de l’app : * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : From a969991fc93c5113d9487a9d140c12b178b25697 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 28 Mar 2023 10:13:42 +0000 Subject: [PATCH 10/10] Auto-update README --- README.md | 5 +++++ README_fr.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index 115ab78..fed1f04 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Outline for YunoHost [![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Working status](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) + [![Install Outline with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) *[Lire ce readme en français.](./README_fr.md)* @@ -55,6 +56,10 @@ The Outline version shipped with this package (v0.65.2) will be released under A The first user to login will automatically be granted admin rights You can then change the user rights by default and/or change the admin user afterwards from the Outline settings page +## :red_circle: Antifeatures + +- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. + ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 60ed56f..2270db9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Outline pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) + [![Installer Outline avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) *[Read this readme in english.](./README.md)* @@ -55,6 +56,10 @@ The Outline version shipped with this package (v0.65.2) will be released under A The first user to login will automatically be granted admin rights You can then change the user rights by default and/or change the admin user afterwards from the Outline settings page +## :red_circle: Fonctions indésirables + +- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. + ## Documentations et ressources * Site officiel de l’app :