From 0b4d06642621f721b7f72889df23cb8a48a61e77 Mon Sep 17 00:00:00 2001 From: Keyman Server Date: Sun, 11 Oct 2026 05:43:51 +0000 Subject: [PATCH 1/6] auto: refresh contributors Test-bot: skip --- _content/about/team/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_content/about/team/index.md b/_content/about/team/index.md index ff267b8e..53fa092d 100644 --- a/_content/about/team/index.md +++ b/_content/about/team/index.md @@ -536,6 +536,7 @@ people who have helped Keyman serve you all better! [erros84](https://github.com/erros84 "erros84") [evangaline-fpcc](https://github.com/evangaline-fpcc "evangaline-fpcc") [evertype](https://evertype.com "evertype") +[facundojaureguibehere](https://github.com/facundojaureguibehere "facundojaureguibehere") [gaikhuanlung](https://community.software.sil.org/u/gaikhuanlung "gaikhuanlung") [geschantz](https://github.com/geschantz "geschantz") [gichegemi](https://github.com/gichegemi "gichegemi") From e4032c301600ec0ccf4c747ac78a02029af09340 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 15 Oct 2026 16:46:44 +0200 Subject: [PATCH 2/6] fix: do not double-encode landing page url Test-bot: skip --- cdn/dev/keyboard-search/search.mjs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cdn/dev/keyboard-search/search.mjs b/cdn/dev/keyboard-search/search.mjs index 9ac2ce61..9209b738 100644 --- a/cdn/dev/keyboard-search/search.mjs +++ b/cdn/dev/keyboard-search/search.mjs @@ -303,7 +303,10 @@ function process_response(q, obsolete, res) { ""); if(kbd.isDedicatedLandingPage) { - $('.title a', k).text(kbd.name).attr('href', `${page_root}/h${encodeURIComponent(kbd.id)}${embed_query_q}`); + // note: for kbd.id here, it has an embedded / and comes from + // dedicated-landing-pages.js, thus is not user-specified and should not + // be re-encoded. + $('.title a', k).text(kbd.name).attr('href', `${page_root}/h${kbd.id}${embed_query_q}`); } else { $('.title a', k).text(kbd.name).attr('href', `${page_root}/${encodeURIComponent(kbd.id)}`+(kbd.match.tag ? '?bcp47='+kbd.match.tag+embed_query_x : embed_query_q)); } From cf4620c617a1474613998dc1e77162e7983823f8 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 15 Oct 2026 16:59:04 +0200 Subject: [PATCH 3/6] fix: use Util::cdn for search.mjs import in keyboards search Note: import(i18n.mjs) does not yet support cache busting Util::cdn, so that's a task for another day Test-bot: skip --- _content/keyboards/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_content/keyboards/index.php b/_content/keyboards/index.php index f5c37eb2..b4069dec 100644 --- a/_content/keyboards/index.php +++ b/_content/keyboards/index.php @@ -75,7 +75,7 @@ From 583cd17ef95d39eb348ea47e2417aeb4a2c053c9 Mon Sep 17 00:00:00 2001 From: Keyman Server Date: Sun, 18 Oct 2026 04:29:35 +0000 Subject: [PATCH 4/6] auto: refresh contributors Test-bot: skip --- _content/about/team/index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_content/about/team/index.md b/_content/about/team/index.md index 53fa092d..51d1be18 100644 --- a/_content/about/team/index.md +++ b/_content/about/team/index.md @@ -489,6 +489,7 @@ people who have helped Keyman serve you all better! [AgMenos47](https://github.com/AgMenos47 "AgMenos47") [Aixther](https://github.com/Aixther "Aixther") [AKAAA252](https://github.com/AKAAA252 "AKAAA252") +[akpanakpan](https://github.com/akpanakpan "akpanakpan") [aldorsvo21](https://github.com/aldorsvo21 "aldorsvo21") [alevy03](https://github.com/alevy03 "alevy03") [alex-larkin](https://github.com/alex-larkin "alex-larkin") @@ -621,6 +622,7 @@ people who have helped Keyman serve you all better! [MuratKaribay](https://github.com/MuratKaribay "MuratKaribay") [mx-ash](https://github.com/mx-ash "mx-ash") [Narvey](https://github.com/Narvey "Narvey") +[ngalalevisankinimbom-commits](https://github.com/ngalalevisankinimbom-commits "ngalalevisankinimbom-commits") [ngaretou](https://github.com/ngaretou "ngaretou") [ngoohebi](https://github.com/ngoohebi "ngoohebi") [nikita-moor](https://github.com/nikita-moor "nikita-moor") @@ -637,6 +639,7 @@ people who have helped Keyman serve you all better! [pndaza](https://github.com/pndaza "pndaza") [poetcin](https://github.com/poetcin "poetcin") [PostmodernEnglish](https://github.com/PostmodernEnglish "PostmodernEnglish") +[pricejoshua](https://github.com/pricejoshua "pricejoshua") [punchcutter](https://github.com/punchcutter "punchcutter") [purple-monkey](https://github.com/purple-monkey "purple-monkey") [rachitralli](https://github.com/rachitralli "rachitralli") From 20a284af586a21d5dab2d6b91f5bc253c2ca7707 Mon Sep 17 00:00:00 2001 From: Meng-Heng Date: Mon, 19 Oct 2026 14:53:58 +0700 Subject: [PATCH 5/6] chore: add a contributor of nyangatom keyboard --- _content/about/team/team.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_content/about/team/team.json b/_content/about/team/team.json index 283bf601..b596d52f 100644 --- a/_content/about/team/team.json +++ b/_content/about/team/team.json @@ -53,6 +53,7 @@ { "level": "contributor", "handle": "seyhachhorn-dev", "pr": "keymanapp/keyman#15827" }, { "level": "contributor", "handle": "phyphy-svg", "pr": "keymanapp/keyman#15827" }, { "level": "contributor", "handle": "facundojaureguibehere", "pr": "keymanapp/keyboards#4119" }, - { "level": "contributor", "handle": "MLocria", "pr": "keymanapp/keyboards#4119" } + { "level": "contributor", "handle": "MLocria", "pr": "keymanapp/keyboards#4119" }, + { "level": "contributor", "handle": "asnakeberhanu", "pr": "keymanapp/keyboards#4062" } ] From 3ef7539ccf1b7c996dfb3e8c13e5aafa05d0eea8 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 22 Oct 2026 08:08:30 +0200 Subject: [PATCH 6/6] fix: update base php8.4-apache images to the 8.4.27 versions This plugs CVE-2026-109618, CVE-2026-109619. Test-bot: skip --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a92e516..1694806e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG BUILDER_CONFIGURATION="release" -FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651 AS composer-builder +FROM php:8.4-apache@sha256:56e7dab56ae21ec10aae951f93cbe7069c1ca68a714dd22ca78724268c78f5de AS composer-builder ENV BUILDER_PLATFORM=docker-composer # Install Zip to use composer @@ -28,7 +28,7 @@ RUN if [ "$BUILDER_CONFIGURATION" = "debug" ]; then \ fi # Site -FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651 +FROM php:8.4-apache@sha256:56e7dab56ae21ec10aae951f93cbe7069c1ca68a714dd22ca78724268c78f5de ENV BUILDER_PLATFORM=docker COPY resources/keyman-site.conf /etc/apache2/conf-available/