From 0ba7e136fc7883e05c010e42d867ea5d2798f7e7 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:37:42 +1100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=93=9D=20Update=20author=20links=20to?= =?UTF-8?q?=20use=20X=20(Twitter)=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/_default/languages.en.toml | 2 +- exampleSite/config/_default/languages.de.toml | 2 +- exampleSite/config/_default/languages.en.toml | 2 +- exampleSite/config/_default/languages.es.toml | 2 +- exampleSite/config/_default/languages.ja.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/_default/languages.en.toml b/config/_default/languages.en.toml index 0331c5d1..a91753aa 100644 --- a/config/_default/languages.en.toml +++ b/config/_default/languages.en.toml @@ -56,7 +56,7 @@ title = "Congo" # { tiktok = "https://tiktok.com/@username" }, # { tumblr = "https://username.tumblr.com" }, # { twitch = "https://twitch.tv/username" }, - # { twitter = "https://twitter.com/username" }, # { whatsapp = "https://wa.me/phone-number" }, + # { x-twitter = "https://twitter.com/username" }, # { youtube = "https://youtube.com/username" }, # ] diff --git a/exampleSite/config/_default/languages.de.toml b/exampleSite/config/_default/languages.de.toml index 8358883c..dc8775b1 100644 --- a/exampleSite/config/_default/languages.de.toml +++ b/exampleSite/config/_default/languages.de.toml @@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors" headline = "Nicht dein Durschnitts-Theme!" bio = "Dies ist ein Beispiel für eine Autorenbiografie, und obwohl hier ein Stockfoto eines Hundes zu sehen ist, wurde dieser Artikel tatsächlich von einem Menschen verfasst. :dog:" links = [ - { twitter = "https://twitter.com/" }, + { x-twitter = "https://twitter.com/" }, { facebook = "https://facebook.com/" }, { linkedin = "https://linkedin.com/" }, { youtube = "https://youtube.com/" }, diff --git a/exampleSite/config/_default/languages.en.toml b/exampleSite/config/_default/languages.en.toml index e5b93f9a..5fa9c709 100644 --- a/exampleSite/config/_default/languages.en.toml +++ b/exampleSite/config/_default/languages.en.toml @@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors" headline = "Not your ordinary theme!" bio = "This is an example author bio, and although there's a stock photo of a dog here, this article was actually created by a human. :dog:" links = [ - { twitter = "https://twitter.com/" }, + { x-twitter = "https://twitter.com/" }, { facebook = "https://facebook.com/" }, { linkedin = "https://linkedin.com/" }, { youtube = "https://youtube.com/" }, diff --git a/exampleSite/config/_default/languages.es.toml b/exampleSite/config/_default/languages.es.toml index 1d499080..b23ab754 100644 --- a/exampleSite/config/_default/languages.es.toml +++ b/exampleSite/config/_default/languages.es.toml @@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors" headline = "¡No es tu tema ordinario!" bio = "Esta es una biografía de autor de ejemplo, y aunque aquí hay una foto de un perro, este artículo en realidad fue creado por un ser humano. :dog:" links = [ - { twitter = "https://twitter.com/" }, + { x-twitter = "https://twitter.com/" }, { facebook = "https://facebook.com/" }, { linkedin = "https://linkedin.com/" }, { youtube = "https://youtube.com/" }, diff --git a/exampleSite/config/_default/languages.ja.toml b/exampleSite/config/_default/languages.ja.toml index b2a04f69..f35202aa 100644 --- a/exampleSite/config/_default/languages.ja.toml +++ b/exampleSite/config/_default/languages.ja.toml @@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors" headline = "ただならぬテーマ!" bio = "これは著者の経歴の例で、ここには犬の画像があるが、実際には人間が作成したものである。 :dog:" links = [ - { twitter = "https://twitter.com/" }, + { x-twitter = "https://twitter.com/" }, { facebook = "https://facebook.com/" }, { linkedin = "https://linkedin.com/" }, { youtube = "https://youtube.com/" }, From c96582cf47c6e47f4deb6076af65b98882ed7660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:08:48 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=B7=20Bump=20actions/setup-node=20?= =?UTF-8?q?from=203=20to=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-theme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index 7086af17..7416c233 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -12,7 +12,7 @@ jobs: with: ref: "${{ github.head_ref }}" - name: Install dependencies and Build Theme - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 - run: npm install - run: npm run assets - name: Commit and push Chart.js changes From c87c9adecea4133b646dea43c2aa75b0b04d5074 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:19:58 +1100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20Pass=20article=20meta=20to?= =?UTF-8?q?=20`safeHTML`=20to=20type=20hint=20for=20`delimit`=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #689 --- CHANGELOG.md | 4 ++++ layouts/partials/article-meta.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 000fa108..4c238adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed + +- Article metadata HTML is output as text when using Hugo v0.120.0 ([#689](https://github.com/jpanther/congo/pull/689)) + ## [2.7.2] - 2023-10-26 ### Changed diff --git a/layouts/partials/article-meta.html b/layouts/partials/article-meta.html index 82838515..37175396 100644 --- a/layouts/partials/article-meta.html +++ b/layouts/partials/article-meta.html @@ -36,7 +36,7 @@
{{/* Output partials */}} {{ with ($meta.Get "partials") }} - {{ delimit . "·" }} + {{ delimit . "·" | safeHTML }} {{ end }} {{/* Output draft label */}} From 54c39a1297faeb2a44eb5d3d18a246e7197484e4 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:51:32 +1100 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- assets/css/compiled/main.css | 2 +- assets/css/main.css | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c238adf..cc04d41c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [2.7.3] - 2023-10-31 + ### Fixed - Article metadata HTML is output as text when using Hugo v0.120.0 ([#689](https://github.com/jpanther/congo/pull/689)) @@ -772,7 +774,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Advanced customisation using simple Tailwind colour definitions and styles - Fully documented -[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.2...HEAD +[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.3...HEAD +[2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3 [2.7.2]: https://github.com/jpanther/congo/compare/v2.7.1...v2.7.2 [2.7.1]: https://github.com/jpanther/congo/compare/v2.7.0...v2.7.1 [2.7.0]: https://github.com/jpanther/congo/compare/v2.6.1...v2.7.0 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 7eb76dd3..0451c90e 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.7.2 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.7.3 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */ diff --git a/assets/css/main.css b/assets/css/main.css index ebd0546f..dd8f26b2 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.7.2 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.7.3 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/package.json b/package.json index 6508d10f..4c913c4a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "2.7.2", + "version": "2.7.3", "description": "Congo theme for Hugo", "scripts": { "preinstall": "rimraf assets/lib",