From 34c037c68bef2eb224ae5ddf712f129d428e85be Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sun, 21 Jan 2024 00:32:01 -0500 Subject: [PATCH 1/6] docs: Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index fc835933..595df3d4 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,7 @@ [![Build + Publish](https://github.com/Requarks/wiki/actions/workflows/build.yml/badge.svg)](https://github.com/Requarks/wiki/actions/workflows/build.yml) [![Huntr](https://img.shields.io/badge/security%20bounty-disclose-brightgreen.svg?style=flat&logo=cachet&logoColor=white)](https://huntr.dev/bounties/disclose) [![GitHub Sponsors](https://img.shields.io/github/sponsors/ngpixel?logo=github&color=ea4aaa)](https://github.com/users/NGPixel/sponsorship) -[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/wikijs?label=backers&color=218bff&logo=opencollective&logoColor=white)](https://opencollective.com/wikijs) -[![Subscribe to Newsletter](https://img.shields.io/badge/newsletter-subscribe-yellow.svg?style=flat&logo=mailchimp&logoColor=white)](https://blog.js.wiki/subscribe) +[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/wikijs?label=backers&color=218bff&logo=opencollective&logoColor=white)](https://opencollective.com/wikijs) [![Chat on Slack](https://img.shields.io/badge/slack-requarks-CC2B5E.svg?style=flat&logo=slack)](https://wiki.requarks.io/slack) [![Follow on Twitter](https://img.shields.io/badge/twitter-%40requarks-blue.svg?style=flat&logo=twitter&logoColor=white)](https://twitter.com/requarks) [![Follow on Telegram](https://img.shields.io/badge/telegram-%40wiki__js-blue.svg?style=flat&logo=telegram)](https://t.me/wiki_js) From 99e74e8eb2de988c8602e6e1311e689533957380 Mon Sep 17 00:00:00 2001 From: Jasmine Tai <45131430+j-tai@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:20:01 -0800 Subject: [PATCH 2/6] feat: upgrade markdown-it-emoji to 3.0.0 (#6945) --- client/components/editor/editor-markdown.vue | 2 +- package.json | 2 +- server/modules/comments/default/comment.js | 2 +- server/modules/rendering/markdown-emoji/renderer.js | 2 +- yarn.lock | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/components/editor/editor-markdown.vue b/client/components/editor/editor-markdown.vue index 04b5c6aa..4ca6e192 100644 --- a/client/components/editor/editor-markdown.vue +++ b/client/components/editor/editor-markdown.vue @@ -200,7 +200,7 @@ import 'codemirror/addon/fold/foldgutter.css' import MarkdownIt from 'markdown-it' import mdAttrs from 'markdown-it-attrs' import mdDecorate from 'markdown-it-decorate' -import mdEmoji from 'markdown-it-emoji' +import { full as mdEmoji } from 'markdown-it-emoji' import mdTaskLists from 'markdown-it-task-lists' import mdExpandTabs from 'markdown-it-expand-tabs' import mdAbbr from 'markdown-it-abbr' diff --git a/package.json b/package.json index e78c91b1..d6723534 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "markdown-it-abbr": "1.0.4", "markdown-it-attrs": "3.0.3", "markdown-it-decorate": "1.2.2", - "markdown-it-emoji": "1.4.0", + "markdown-it-emoji": "3.0.0", "markdown-it-expand-tabs": "1.0.13", "markdown-it-external-links": "0.0.6", "markdown-it-footnote": "3.0.3", diff --git a/server/modules/comments/default/comment.js b/server/modules/comments/default/comment.js index fa819c8b..10948f3e 100644 --- a/server/modules/comments/default/comment.js +++ b/server/modules/comments/default/comment.js @@ -1,5 +1,5 @@ const md = require('markdown-it') -const mdEmoji = require('markdown-it-emoji') +const { full: mdEmoji } = require('markdown-it-emoji') const { JSDOM } = require('jsdom') const createDOMPurify = require('dompurify') const _ = require('lodash') diff --git a/server/modules/rendering/markdown-emoji/renderer.js b/server/modules/rendering/markdown-emoji/renderer.js index 331b97ef..0c7e7407 100644 --- a/server/modules/rendering/markdown-emoji/renderer.js +++ b/server/modules/rendering/markdown-emoji/renderer.js @@ -1,4 +1,4 @@ -const mdEmoji = require('markdown-it-emoji') +const { full: mdEmoji } = require('markdown-it-emoji') const twemoji = require('twemoji') // ------------------------------------ diff --git a/yarn.lock b/yarn.lock index d7003475..6ac6a6f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13146,10 +13146,10 @@ markdown-it-decorate@1.2.2: resolved "https://registry.yarnpkg.com/markdown-it-decorate/-/markdown-it-decorate-1.2.2.tgz#f1e11d11d837ae78906198f8a2c974f0e646acb7" integrity sha512-7BFWJ97KBXgkaPVjKHISQnhSW8RWQ7yRNXpr8pPUV2Rw4GHvGrgb6CelKCM+GSijP0uSLCAVfc/knWIz+2v/Sw== -markdown-it-emoji@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc" - integrity sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg== +markdown-it-emoji@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-3.0.0.tgz#8475a04d671d7c93f931b76fb90c582768b7f0b5" + integrity sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg== markdown-it-expand-tabs@1.0.13: version "1.0.13" From b1e1759f254b172069849fa858c7923c8da0f415 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sun, 28 Jan 2024 20:03:06 -0500 Subject: [PATCH 3/6] fix: set securityTrustProxy to false by default --- client/components/admin/admin-security.vue | 2 +- server/app/data.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/admin/admin-security.vue b/client/components/admin/admin-security.vue index 7a8d305b..8c062c52 100644 --- a/client/components/admin/admin-security.vue +++ b/client/components/admin/admin-security.vue @@ -265,7 +265,7 @@ export default { securityOpenRedirect: true, securityIframe: true, securityReferrerPolicy: true, - securityTrustProxy: true, + securityTrustProxy: false, securitySRI: true, securityHSTS: false, securityHSTSDuration: 0, diff --git a/server/app/data.yml b/server/app/data.yml index 7c3d0803..0cd628a6 100644 --- a/server/app/data.yml +++ b/server/app/data.yml @@ -85,7 +85,7 @@ defaults: securityOpenRedirect: true securityIframe: true securityReferrerPolicy: true - securityTrustProxy: true + securityTrustProxy: false securitySRI: true securityHSTS: false securityHSTSDuration: 300 From ece5753ebbe6e0e94a565045e53c32e85eab8aca Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Wed, 7 Feb 2024 15:31:49 -0500 Subject: [PATCH 4/6] docs: Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 595df3d4..942857c1 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri - Cloud Data Hosting LLC ([@CloudDataHostingLLC](https://github.com/CloudDataHostingLLC)) - Cole Manning ([@RVRX](https://github.com/RVRX)) - CrazyMarvin ([@CrazyMarvin](https://github.com/CrazyMarvin)) +- Daniel Horner ([@danhorner](https://github.com/danhorner)) - David Christian Holin ([@SirGibihm](https://github.com/SirGibihm)) - Dragan Espenschied ([@despens](https://github.com/despens)) - Elijah Zobenko ([@he110](https://github.com/he110)) From d5af4cb0684f58953402fa68cf58a27fa58a1e82 Mon Sep 17 00:00:00 2001 From: craph <14820052+craph@users.noreply.github.com> Date: Wed, 28 Feb 2024 22:07:19 +0100 Subject: [PATCH 5/6] chore: fix python issue for node18 in dev Dockerfile (#7029) * Fix: email toLowerCase * Fix python issue for node18 in Dockerfile --- dev/containers/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/containers/Dockerfile b/dev/containers/Dockerfile index 36a777f8..5d404880 100644 --- a/dev/containers/Dockerfile +++ b/dev/containers/Dockerfile @@ -5,7 +5,7 @@ FROM node:18 LABEL maintainer "requarks.io" RUN apt-get update && \ - apt-get install -y bash curl git python make g++ nano openssh-server gnupg && \ + apt-get install -y bash curl git python3 make g++ nano openssh-server gnupg && \ mkdir -p /wiki WORKDIR /wiki From 66ca18c499194effdbebc80bb1c1f799b7ee98a0 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 16 Mar 2024 01:15:24 -0400 Subject: [PATCH 6/6] docs: Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 942857c1..40fac120 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,12 @@ Support this project by becoming a sponsor. Your name will show up in the Contri - + + + + + + @@ -188,11 +193,11 @@ Support this project by becoming a sponsor. Your name will show up in the Contri - Marcilio Leite Neto ([@marclneto](https://github.com/marclneto)) - Mattias Johnson ([@mattiasJohnson](https://github.com/mattiasJohnson)) - Max Ricketts-Uy ([@MaxRickettsUy](https://github.com/MaxRickettsUy)) +- Mickael Asseline ([@PAPAMICA](https://github.com/PAPAMICA)) -- Mickael Asseline ([@PAPAMICA](https://github.com/PAPAMICA)) - Mitchell Rowton ([@mrowton](https://github.com/mrowton)) - M. Scott Ford ([@mscottford](https://github.com/mscottford)) - Nick Halase ([@nhalase](https://github.com/nhalase)) @@ -211,6 +216,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri - Tyler Denman ([@tylerguy](https://github.com/tylerguy)) - Victor Bilgin ([@vbilgin](https://github.com/vbilgin)) - VMO Solutions ([@vmosolutions](https://github.com/vmosolutions)) +- YazMogg35 ([@YazMogg35](https://github.com/YazMogg35)) - Yu Yongwoo ([@uyu423](https://github.com/uyu423)) - ameyrakheja ([@ameyrakheja](https://github.com/ameyrakheja)) - aniketpanjwani ([@aniketpanjwani](https://github.com/aniketpanjwani))