Skip to content
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

Jump to bottom

chore: merge master into linux-mcompile 🐘 #10449

Merged
merged 1,354 commits into from
Jan 19, 2024
Merged

chore: merge master into linux-mcompile 🐘 #10449

merged 1,354 commits into from
Jan 19, 2024

Conversation

keyman-server
Copy link
Collaborator

jahorton and others added 30 commits December 18, 2023 15:24
@jahorton
fix(web): transplanted layout methods must be @enumerable for ES6 bun…
b95051b 
…dling
@jahorton
fix(web): es5 lm-worker bundling
1513582
@jahorton
feat(web): es6 artifact for app/webview - required extra changes to d…
23d6dda 
…o well
@sgschantz
load persisted options and enable unit test
ccee68c
@sgschantz
Merge pull request #10271 from keymanapp/fix/mac/invalid-context-test
3eb44b8 
fix(mac): unit tests should expect core context clear after invalidate
@rc-swag @ermshiperete
fix(windows): review comments and suggestions
deceabd 
Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
@jahorton
Merge pull request #10270 from keymanapp/feat/web/held-bksp-highlighting
84a8393
@keyman-server
auto: increment master version to 17.0.233
ed5ba9f
@keyman-server
Merge pull request #10277 from keymanapp/auto/version-master-17.0.233
83dbc71 
auto: increment master version to 17.0.233
@srl295
Merge branch 'master' into feat/developer/9451-key-not-found-epic-ldml
296421f
@rc-swag
chore(core): Merge branch 'master' into fix/core/clear-core-context-i…
1cb2881 
…nvalidate
@srl295
fix(web): unbreak some ts paths
6364adc
@rc-swag
Merge pull request #10279 from keymanapp/fix/web/unbreak-epic-ldml
50d5da7 
fix(web): unbreak some ts paths
@rc-swag
Merge branch 'master' into fix/core/clear-core-context-invalidate
268061f
@darcywong00
Merge branch 'master' into fix/fv/keyboards-csv
7f71cf7
@jahorton
fix(web): default multitap logic conditions on and affects both defau…
5eb787b 
…lt and shift layers
@jahorton
fix(web): defaultShift null-guard
b824fb9
@jahorton
chore(web): changes per review comments
f78eeaa
@jahorton
chore(web): a bit more cleanup
f723f14
@rc-swag
Merge pull request #10230 from keymanapp/fix/core/clear-core-context-…
4246c7a 
…invalidate

fix(core): clear core context on invalidate cache
@sgschantz
comment changes
e62dd67
@jahorton
fix(web): adds Symbol, Map polyfill for main Web
90ecdf3
@jahorton
fix(web): fixes multi-part gestures
1ba5a21
@jahorton
change(web): Android engine now includes both ES5 and ES6 KMW versions
a2305c8
@jahorton
chore(android): oh right, .gitignore update
9c2e2b5
@jahorton
fix(web): error that only appeared in ES6 mode (embedded-kbd specific)
f9df763
@jahorton
chore(android): map-polyfill is compiled; should not be checked-in
5d8e7c2
@sgschantz
remove Atom editor from hard-coded non-compliant list
e34cc9c
@sgschantz @jahorton
comment cleanup
a42a2f0 
Co-authored-by: Joshua Horton <joshua_horton@sil.org>
@darcywong00
Merge pull request #10269 from keymanapp/fix/fv/keyboards-csv
1c216bb 
fix(oem/fv): Add fv_hulquminum_combine
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Jan 19, 2024 •
edited
Loading

User Test Results

Test specification and instructions

User tests are not required

@keymanapp-test-bot keymanapp-test-bot bot changed the title chore: merge master into linux-mcompile chore: merge master into linux-mcompile 🐘 Jan 19, 2024
@keymanapp-test-bot keymanapp-test-bot bot added this to the A17S30 milestone Jan 19, 2024
mcdurdin
mcdurdin approved these changes Jan 19, 2024
View reviewed changes
Copy link
Member

@mcdurdin mcdurdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@mcdurdin mcdurdin merged commit 07ddea1 into epic/linux-mcompile Jan 19, 2024
144 of 154 checks passed
@mcdurdin mcdurdin deleted the chore/merge-master-into-linux-mcompile branch January 19, 2024 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcdurdin mcdurdin mcdurdin approved these changes

@rc-swag rc-swag Awaiting requested review from rc-swag rc-swag is a code owner

@ermshiperete ermshiperete Awaiting requested review from ermshiperete ermshiperete is a code owner

@jahorton jahorton Awaiting requested review from jahorton jahorton is a code owner

@sgschantz sgschantz Awaiting requested review from sgschantz sgschantz is a code owner

@darcywong00 darcywong00 Awaiting requested review from darcywong00 darcywong00 is a code owner

@SabineSIL SabineSIL Awaiting requested review from SabineSIL SabineSIL is a code owner

Assignees
No one assigned
Labels
android/app/ android/engine/ android/samples/ android/ chore common/models/templates/ common/models/wordbreakers/ common/models/ common/resources/ Build infrastructure common/web/ common/ core/ Keyman Core developer/compilers/ developer/ide/ developer/ docs epic-linux-mcompile ios/app/ ios/engine/ ios/ linux/config/ linux/engine/ linux/ mac/ oem/fv/android/ oem/fv/ios/ oem/fv/ oem/ web/ windows/config/ windows/engine/ windows/
Projects
None yet
Milestone
A17S30
Development

Successfully merging this pull request may close these issues.
9 participants
@keyman-server @mcdurdin @jahorton @sgschantz @rc-swag @srl295 @darcywong00 @ermshiperete @Nnyny