Skip to content

auto: A19S35 merge master into staging #819

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 9 commits into from
Aug 14, 2026
Merged

auto: A19S35 merge master into staging #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d53cc46
chore(deps): bump axios from 1.16.0 to 1.18.1 in /_scripts/contributors
dependabot[bot] Jul 20, 2026
ae71914
chore(deps): bump brace-expansion in /_scripts/contributors
dependabot[bot] Aug 1, 2026
88db4e8
chore: manually add new contributors
mcdurdin Aug 11, 2026
29d8215
Merge pull request #817 from keymanapp/chore/new-contributors
mcdurdin Aug 12, 2026
ce6d240
fix: lang query parameter overrides session lang variable
mcdurdin Aug 13, 2026
b811ea2
Merge pull request #818 from keymanapp/fix/lang-parameter-overrides-s…
mcdurdin Aug 13, 2026
c39e35a
Merge pull request #809 from keymanapp/dependabot/npm_and_yarn/_scrip…
mcdurdin Aug 14, 2026
2489274
Merge pull request #812 from keymanapp/dependabot/npm_and_yarn/_scrip…
mcdurdin Aug 14, 2026
d9e974d
Merge branch 'staging' into auto/A19S35-merge-master-into-staging
keyman-server Aug 14, 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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ all from the same port (default port 80).
**Recommended:** Use [shared-sites] to control startup and shutdown of all
keyman.com sites together.

## More documentation

Additional website configuration documentation is available at:
* https://github.com/keymanapp/keyman/blob/master/docs/websites/README.md

### Prerequisites

The host machine needs the following apps installed:
Expand Down
9 changes: 9 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 @@ -493,6 +493,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/82162128?v=4" alt="alex-larkin" />](https://github.com/alex-larkin "alex-larkin")
[<img class='contributor-minor' src="https://github.com/anandakm.png?size=240" alt="anandakm" />](https://github.com/anandakm "anandakm")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/4560208?v=4" alt="Anontamon" />](https://github.com/Anontamon "Anontamon")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/311709774?v=4" alt="anuisainyiu-droid" />](https://github.com/anuisainyiu-droid "anuisainyiu-droid")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/15011591?v=4" alt="anvalon" />](https://github.com/anvalon "anvalon")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/8268042?v=4" alt="atabekm" />](https://github.com/atabekm "atabekm")
[<img class='contributor-minor' src="https://github.com/athinkra.png?size=240" alt="athinkra" />](https://github.com/athinkra "athinkra")
Expand Down Expand Up @@ -578,6 +579,7 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/114847889?v=4" alt="kingsuper195" />](https://github.com/kingsuper195 "kingsuper195")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/208134474?v=4" alt="kitty-liu-wy" />](https://github.com/kitty-liu-wy "kitty-liu-wy")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/139617633?v=4" alt="kojamori" />](https://github.com/kojamori "kojamori")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/252690929?v=4" alt="kongchanlina" />](https://github.com/kongchanlina "kongchanlina")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/139705783?v=4" alt="kovacshviktor" />](https://github.com/kovacshviktor "kovacshviktor")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/56163492?v=4" alt="laineyhm" />](https://github.com/laineyhm "laineyhm")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/176964202?v=4" alt="Laitei40" />](https://github.com/Laitei40 "Laitei40")
Expand All @@ -597,9 +599,12 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/8888020?v=4" alt="MCGallaspy" />](https://github.com/MCGallaspy "MCGallaspy")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/3444521?v=4" alt="megahirt" />](https://github.com/megahirt "megahirt")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/5333693?v=4" alt="mehmetoguzderin" />](https://github.com/mehmetoguzderin "mehmetoguzderin")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/78869428?v=4" alt="memaynor" />](https://github.com/memaynor "memaynor")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/191969030?v=4" alt="Mengchou97" />](https://github.com/Mengchou97 "Mengchou97")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/5687149?v=4" alt="mhosken" />](https://github.com/mhosken "mhosken")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/88502274?v=4" alt="michael-wynne-wsu" />](https://github.com/michael-wynne-wsu "michael-wynne-wsu")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/73817896?v=4" alt="miketvo" />](https://github.com/miketvo "miketvo")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/251532424?v=4" alt="minanlynna-code" />](https://github.com/minanlynna-code "minanlynna-code")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/51888982?v=4" alt="MLocria" />](https://github.com/MLocria "MLocria")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/25468552?v=4" alt="mondele" />](https://github.com/mondele "mondele")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/26617447?v=4" alt="Monitvilla" />](https://github.com/Monitvilla "Monitvilla")
Expand All @@ -619,13 +624,15 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/153693839?v=4" alt="okandale" />](https://github.com/okandale "okandale")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/76998333?v=4" alt="OscarEwen" />](https://github.com/OscarEwen "OscarEwen")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/180665176?v=4" alt="PekingSpades" />](https://github.com/PekingSpades "PekingSpades")
[<img class='contributor-minor' src="https://github.com/phyphy-svg.png?size=240" alt="phyphy-svg" />](https://github.com/phyphy-svg "phyphy-svg")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/1788180?v=4" alt="pierzcham" />](https://github.com/pierzcham "pierzcham")
[<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/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")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/272021146?v=4" alt="rado003" />](https://github.com/rado003 "rado003")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/93768384?v=4" alt="RafalBru" />](https://github.com/RafalBru "RafalBru")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/83806286?v=4" alt="Raji1205" />](https://github.com/Raji1205 "Raji1205")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/12659192?v=4" alt="ramesh-k" />](https://github.com/ramesh-k "ramesh-k")
Expand All @@ -646,10 +653,12 @@ people who have helped Keyman serve you all better!
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/5070211?v=4" alt="sapradhan" />](https://github.com/sapradhan "sapradhan")
[<img class='contributor-minor' src="/cdn/dev/img/user.png" alt="saraiki" />](https://community.software.sil.org/u/saraiki "saraiki")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/26537840?v=4" alt="sdysart" />](https://github.com/sdysart "sdysart")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/250074241?v=4" alt="seanvisal69-ux" />](https://github.com/seanvisal69-ux "seanvisal69-ux")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/264226781?v=4" alt="sekumaliangoro-glitch" />](https://github.com/sekumaliangoro-glitch "sekumaliangoro-glitch")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/3781280?v=4" alt="serapio" />](https://github.com/serapio "serapio")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/11654191?v=4" alt="Sethyboy0" />](https://github.com/Sethyboy0 "Sethyboy0")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/16904461?v=4" alt="sewhite" />](https://github.com/sewhite "sewhite")
[<img class='contributor-minor' src="https://github.com/seyhachhorn-dev.png?size=240" alt="seyhachhorn-dev" />](https://github.com/seyhachhorn-dev "seyhachhorn-dev")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/59408625?v=4" alt="Shavian-info" />](https://github.com/Shavian-info "Shavian-info")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/4686809?v=4" alt="showgan" />](https://github.com/showgan "showgan")
[<img class='contributor-minor' src="https://avatars.githubusercontent.com/u/5095331?v=4" alt="Shreeshrii" />](https://github.com/Shreeshrii "Shreeshrii")
Expand Down
42 changes: 22 additions & 20 deletions _content/about/team/team.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,26 @@

{ "level": "contributor-major", "handle": "sillsdev-dondillard" },

{ "level": "contributor", "handle": "evangaline-fpcc", "pr": 3858 },
{ "level": "contributor", "handle": "DOUCKI56", "pr": 3771 },
{ "level": "contributor", "handle": "Noon7007", "pr": 3701 },
{ "level": "contributor", "handle": "Into_Besa", "url": "https://community.software.sil.org/u/Into_Besa", "pr": 3062 },
{ "level": "contributor", "handle": "gaikhuanlung", "url": "https://community.software.sil.org/u/gaikhuanlung", "pr": 2722 },
{ "level": "contributor", "handle": "mujeebcpy", "pr": 2586 },
{ "level": "contributor", "handle": "johannes_genberg", "url": "https://community.software.sil.org/u/johannes_genberg", "pr": 2232 },
{ "level": "contributor", "handle": "RiyadhAlfareh", "pr": 2230 },
{ "level": "contributor", "handle": "toby_anderson", "url": "https://community.software.sil.org/u/toby_anderson", "pr": 2154 },
{ "level": "contributor", "handle": "takahiro-harada", "url": "https://aclanthology.org/people/takahiro-harada/unverified/", "pr": 1717 },
{ "level": "contributor", "handle": "beran", "url": "https://community.software.sil.org/u/beran", "pr": 1675 },
{ "level": "contributor", "handle": "hinditutorpoint", "pr": 1660 },
{ "level": "contributor", "handle": "MasoodDur", "pr": 1588 },
{ "level": "contributor", "handle": "connman90", "pr": 1468 },
{ "level": "contributor", "handle": "athinkra", "pr": 1292 },
{ "level": "contributor", "handle": "rana_zubair", "url": "https://community.software.sil.org/u/rana_zubair", "pr": 1156 },
{ "level": "contributor", "handle": "chris_rice", "url": "https://community.software.sil.org/u/chris_rice", "pr": 1094 },
{ "level": "contributor", "handle": "anandakm", "pr": 1093 },
{ "level": "contributor", "handle": "saraiki", "url": "https://community.software.sil.org/u/saraiki", "pr": 1057 },
{ "level": "contributor", "handle": "evertype", "url": "https://evertype.com", "pr": 619 }
{ "level": "contributor", "handle": "evangaline-fpcc", "pr": "keymanapp/keyboards#3858" },
{ "level": "contributor", "handle": "DOUCKI56", "pr": "keymanapp/keyboards#3771" },
{ "level": "contributor", "handle": "Noon7007", "pr": "keymanapp/keyboards#3701" },
{ "level": "contributor", "handle": "Into_Besa", "url": "https://community.software.sil.org/u/Into_Besa", "pr": "keymanapp/keyboards#3062" },
{ "level": "contributor", "handle": "gaikhuanlung", "url": "https://community.software.sil.org/u/gaikhuanlung", "pr": "keymanapp/keyboards#2722" },
{ "level": "contributor", "handle": "mujeebcpy", "pr": "keymanapp/keyboards#2586" },
{ "level": "contributor", "handle": "johannes_genberg", "url": "https://community.software.sil.org/u/johannes_genberg", "pr": "keymanapp/keyboards#2232" },
{ "level": "contributor", "handle": "RiyadhAlfareh", "pr": "keymanapp/keyboards#2230" },
{ "level": "contributor", "handle": "toby_anderson", "url": "https://community.software.sil.org/u/toby_anderson", "pr": "keymanapp/keyboards#2154" },
{ "level": "contributor", "handle": "takahiro-harada", "url": "https://aclanthology.org/people/takahiro-harada/unverified/", "pr": "keymanapp/keyboards#1717" },
{ "level": "contributor", "handle": "beran", "url": "https://community.software.sil.org/u/beran", "pr": "keymanapp/keyboards#1675" },
{ "level": "contributor", "handle": "hinditutorpoint", "pr": "keymanapp/keyboards#1660" },
{ "level": "contributor", "handle": "MasoodDur", "pr": "keymanapp/keyboards#1588" },
{ "level": "contributor", "handle": "connman90", "pr": "keymanapp/keyboards#1468" },
{ "level": "contributor", "handle": "athinkra", "pr": "keymanapp/keyboards#1292" },
{ "level": "contributor", "handle": "rana_zubair", "url": "https://community.software.sil.org/u/rana_zubair", "pr": "keymanapp/keyboards#1156" },
{ "level": "contributor", "handle": "chris_rice", "url": "https://community.software.sil.org/u/chris_rice", "pr": "keymanapp/keyboards#1094" },
{ "level": "contributor", "handle": "anandakm", "pr": "keymanapp/keyboards#1093" },
{ "level": "contributor", "handle": "saraiki", "url": "https://community.software.sil.org/u/saraiki", "pr": "keymanapp/keyboards#1057" },
{ "level": "contributor", "handle": "evertype", "url": "https://evertype.com", "pr": "keymanapp/keyboards#619" },
{ "level": "contributor", "handle": "seyhachhorn-dev", "pr": "keymanapp/keyman#15827" },
{ "level": "contributor", "handle": "phyphy-svg", "pr": "keymanapp/keyman#15827" }
]
6 changes: 4 additions & 2 deletions _content/keyboards/session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
// and otherwise cookies are blocked
setcookie('embed_keyboards_no_locale_redirect', '1', ["secure" => true, "samesite" => 'None', 'path' => '/']);

if(!isset($_SESSION['lang'])) {
$_SESSION['lang'] = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : 'en';
if(isset($_REQUEST['lang'])) {
$_SESSION['lang'] = $_REQUEST['lang'];
} else if(!isset($_SESSION['lang'])) {
$_SESSION['lang'] = 'en';
}
Locale::setOverrideLocale($_SESSION['lang']);

Expand Down
40 changes: 33 additions & 7 deletions _scripts/contributors/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.