Skip to content

auto: B19S4 merge master into staging #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keyman-status merged 13 commits into from
Oct 24, 2026
Merged

auto: B19S4 merge master into staging #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0b4d066
auto: refresh contributors
keyman-server Oct 11, 2026
179f76d
Merge pull request #854 from keymanapp/auto/contributors
keyman-status Oct 11, 2026
e4032c3
fix: do not double-encode landing page url
mcdurdin Oct 15, 2026
70a05e3
Merge pull request #855 from keymanapp/fix/srl295-learning-greek
mcdurdin Oct 15, 2026
cf4620c
fix: use Util::cdn for search.mjs import in keyboards search
mcdurdin Oct 15, 2026
8ddb76e
Merge pull request #856 from keymanapp/fix/srl295-learns-about-cache-…
mcdurdin Oct 15, 2026
583cd17
auto: refresh contributors
keyman-server Oct 18, 2026
85e9fce
Merge pull request #858 from keymanapp/auto/contributors
keyman-status Oct 18, 2026
20a284a
chore: add a contributor of nyangatom keyboard
Meng-Heng Oct 19, 2026
f13aee3
Merge pull request #859 from keymanapp/chore/add-contributor
mcdurdin Oct 19, 2026
3ef7539
fix: update base php8.4-apache images to the 8.4.27 versions
mcdurdin Oct 22, 2026
c6d2254
Merge pull request #861 from keymanapp/fix/php-cve-2026-10961x
mcdurdin Oct 22, 2026
c93b614
Merge branch 'staging' into auto/B19S4-merge-master-into-staging
keyman-server Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/
Expand Down
4 changes: 4 additions & 0 deletions _content/about/team/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/76251057?v=4" alt="AgMenos47" />](https://github.com/AgMenos47 "AgMenos47")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/186282342?v=4" alt="Aixther" />](https://github.com/Aixther "Aixther")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/266491785?v=4" alt="AKAAA252" />](https://github.com/AKAAA252 "AKAAA252")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/343120049?v=4" alt="akpanakpan" />](https://github.com/akpanakpan "akpanakpan")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/89323017?v=4" alt="aldorsvo21" />](https://github.com/aldorsvo21 "aldorsvo21")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/20852968?v=4" alt="alevy03" />](https://github.com/alevy03 "alevy03")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/82162128?v=4" alt="alex-larkin" />](https://github.com/alex-larkin "alex-larkin")
Expand Down Expand Up @@ -536,6 +537,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/54675996?v=4" alt="erros84" />](https://github.com/erros84 "erros84")
[<img class='contributor-minor' src="https://github.com/evangaline-fpcc.png?size=240" alt="evangaline-fpcc" />](https://github.com/evangaline-fpcc "evangaline-fpcc")
[<img class='contributor-minor' src="/cdn/dev/img/user.png" alt="evertype" />](https://evertype.com "evertype")
[<img class='contributor-minor' src="https://github.com/facundojaureguibehere.png?size=240" alt="facundojaureguibehere" />](https://github.com/facundojaureguibehere "facundojaureguibehere")
[<img class='contributor-minor' src="/cdn/dev/img/user.png" alt="gaikhuanlung" />](https://community.software.sil.org/u/gaikhuanlung "gaikhuanlung")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/294582347?v=4" alt="geschantz" />](https://github.com/geschantz "geschantz")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/117494817?v=4" alt="gichegemi" />](https://github.com/gichegemi "gichegemi")
Expand Down Expand Up @@ -620,6 +622,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/40431755?v=4" alt="MuratKaribay" />](https://github.com/MuratKaribay "MuratKaribay")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/89265521?v=4" alt="mx-ash" />](https://github.com/mx-ash "mx-ash")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/2171161?v=4" alt="Narvey" />](https://github.com/Narvey "Narvey")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/341403055?v=4" alt="ngalalevisankinimbom-commits" />](https://github.com/ngalalevisankinimbom-commits "ngalalevisankinimbom-commits")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/58198267?v=4" alt="ngaretou" />](https://github.com/ngaretou "ngaretou")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/301464?v=4" alt="ngoohebi" />](https://github.com/ngoohebi "ngoohebi")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/13879891?v=4" alt="nikita-moor" />](https://github.com/nikita-moor "nikita-moor")
Expand All @@ -636,6 +639,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/37981688?v=4" alt="pndaza" />](https://github.com/pndaza "pndaza")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/9081684?v=4" alt="poetcin" />](https://github.com/poetcin "poetcin")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/87946317?v=4" alt="PostmodernEnglish" />](https://github.com/PostmodernEnglish "PostmodernEnglish")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/44819394?v=4" alt="pricejoshua" />](https://github.com/pricejoshua "pricejoshua")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/11257204?v=4" alt="punchcutter" />](https://github.com/punchcutter "punchcutter")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/30228695?v=4" alt="purple-monkey" />](https://github.com/purple-monkey "purple-monkey")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/8731787?v=4" alt="rachitralli" />](https://github.com/rachitralli "rachitralli")
Expand Down
3 changes: 2 additions & 1 deletion _content/about/team/team.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

]
2 changes: 1 addition & 1 deletion _content/keyboards/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<script type="module">
// Wrapper to call .mjs function
import { do_search } from '../../cdn/dev/keyboard-search/search.mjs';
import { do_search } from '<?= Util::cdn('keyboard-search/search.mjs') ?>';
document.getElementById('search-f').onclick = do_search;
</script>

Expand Down
5 changes: 4 additions & 1 deletion cdn/dev/keyboard-search/search.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,10 @@ function process_response(q, obsolete, res) {
"</div>");

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));
}
Expand Down
Loading