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(common): Merge beta to master for Sprint B17S6 (part 2) #11305

Merged
merged 28 commits into from
Apr 26, 2024
Merged

chore(common): Merge beta to master for Sprint B17S6 (part 2) #11305

merged 28 commits into from
Apr 26, 2024

Conversation

darcywong00
Copy link
Contributor

Follows #11291 in merging beta to master for end of Sprint B17S6

@keymanapp-test-bot skip

darcywong00 and others added 25 commits April 11, 2024 08:52
@darcywong00
fix(android/engine): Escape percent-sign character for Javascript
2e32bd5
@darcywong00
Merge remote-tracking branch 'origin/beta' into fix/android/long-context
99ce1e9
@markcsinclair
chore(developer): replace some fixture paths with constants
65429bd
@markcsinclair
chore(developer): replace khmer_angkor sources with constant
5e14f00
@markcsinclair
chore(developer): simplify a TextDecoder.decode stub
e6f40ad
@jahorton
fix(web): osk-view hidden by default on construction
770c9da
@jahorton
fix(android): fixes kbd text zoom to prevent accessibility cross-effects
54d5d37
@darcywong00
fix(android/engine): URIEncode string for updateText()
7d18c12
@darcywong00
fix(android/engine): Handle setSpacebarText()
1ae8321
@darcywong00
chore(android/engine): Fix comment
0c3351f
@jahorton
chore(web): Merge branch 'beta' into fix/web/visible-empty-osk
37196b1
@darcywong00
test(android/samples): Add special characters to keyboard harness kmp
c79487f
@markcsinclair
chore(developer): Merge branch 'beta' into test/developer/keyboard-in…
00d7b6c 
…fo-compiler-messages-unit-tests-2
@markcsinclair
chore(developer): some further elimination of code redundancy
e742926
@markcsinclair
chore(developer): Merge branch 'beta' into test/developer/keyboard-in…
9cb29b0 
…fo-compiler-messages-unit-tests-2
@keyman-server
auto: increment beta version to 17.0.314
6206fa6
@keyman-server
Merge pull request #11294 from keymanapp/auto/version-beta-17.0.314
6504049 
auto: increment beta version to 17.0.314
@darcywong00
fix(android/app): Update storage permissions for Android 12.0+
7038fb4
@darcywong00
Merge pull request #11206 from keymanapp/fix/android/long-context
7fc7d0c 
fix(android/engine): URIEncode strings passed to Javascript
@markcsinclair
chore(developer): Merge branch 'beta' into test/developer/keyboard-in…
343a45c 
…fo-compiler-messages-unit-tests-2
@darcywong00
Merge pull request #11299 from keymanapp/fix/android/storage-permissi…
32a8632 
…on-2

fix(android/app): Update storage permissions for Android 12.0+
@markcsinclair
Merge pull request #11253 from keymanapp/test/developer/keyboard-info…
4ae7418 
…-compiler-messages-unit-tests-2

test(developer): keyboard info compiler messages unit tests 2
@keyman-server
auto: increment beta version to 17.0.315
392381a
@keyman-server
Merge pull request #11304 from keymanapp/auto/version-beta-17.0.315
a8a59ae 
auto: increment beta version to 17.0.315
@darcywong00
chore(common): Merge beta' into master for Sprint B17S6 (part 2)
3838e88
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Apr 25, 2024 •
edited
Loading

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot added this to the B17S6 milestone Apr 25, 2024
jahorton added 2 commits April 26, 2024 07:54
@jahorton
Merge pull request #11258 from keymanapp/fix/web/visible-empty-osk
d440116 
fix(web): osk-view hidden by default on construction
@jahorton
Merge pull request #11281 from keymanapp/fix/android/locked-text-zoom
1de9b0c 
fix(android): fixes kbd text zoom to prevent accessibility cross-effects
jahorton
jahorton reviewed Apr 26, 2024
View reviewed changes
Copy link
Contributor

@jahorton jahorton left a comment

Choose a reason for hiding this comment

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

A couple more things got merged in this morning; would it be a bit late for those to slip in, too?

Granted, I guess we haven't enacted a code-freeze 🧊 🥶 yet, so I guess they could land in a follow-up.

@darcywong00
Copy link
Contributor Author

yeah, we got time to throw those in too...

jahorton
jahorton approved these changes Apr 26, 2024
View reviewed changes
Copy link
Contributor

@jahorton jahorton left a comment

Choose a reason for hiding this comment

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

History looks good; glad there weren't blank entries left by the automation this time. Unless there were, in which case... glad you caught 'em.

LGTM.

@darcywong00 darcywong00 merged commit 71f3287 into master Apr 26, 2024
15 checks passed
@darcywong00 darcywong00 deleted the chore/beta-to-master-b17s6-2 branch April 26, 2024 06:35
@keyman-server
Copy link
Collaborator

Changes in this pull request will be available for download in Keyman version 18.0.23-alpha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jahorton jahorton jahorton approved these changes

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

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

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

Assignees
No one assigned
Labels
android/app/ android/engine/ android/ chore common/ developer/compilers/ developer/ web/
Projects
None yet
Milestone
B17S6
Development

Successfully merging this pull request may close these issues.
4 participants
@darcywong00 @keyman-server @jahorton @markcsinclair