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 beta into master A18S1 #11332

Merged
merged 83 commits into from
May 2, 2024
Merged

chore: merge beta into master A18S1 #11332

merged 83 commits into from
May 2, 2024

Conversation

mcdurdin
Copy link
Member

@mcdurdin mcdurdin commented May 2, 2024

srl295 and others added 30 commits April 4, 2024 12:14
@srl295
chore(core): reinstate context reset test in ldml
c86ab58 
- reverts 04a6e16 for k_102_keytest.xml
@srl295
fix(core): core to automatically reset context if a frame key pressed
c91095f 
- update ldml test with an exception for k_102_keytest
@srl295
Merge branch 'chore/core/11112-lone-surrogate' into fix/core/10955-re…
2298f11 
…set-on-frame
@srl295
fix(core): core to automatically reset context if a frame key pressed
f1b0d8c 
- move the reset table into its own cpp
- update function signatures per review comments

Fixes: #10955
@srl295
fix(core): core to automatically reset context if a frame key pressed
628d13d 
- update comments per review

Fixes: #10955
@srl295
fix(core): update ldml test source to handle reset
784a994 
Fixes: #10955
@srl295
fix(core): update ldml test source to handle reset
55483e4 
- correct invalidate logic

Fixes: #10955
@srl295
fix(core): update core to handle reset context
a455c5b 
- updates to debug_api test for rearranged items
- try to rearrange the action queue to match prior behavior

Fixes: #10955
@srl295
fix(core): update core to handle reset context
11b0712 
- reset for ctrl or alt modifiers, but NOT for key-up

Fixes: #10955
@srl295
fix(core): dx: denoise test
111a50c
@srl295
fix(core): update core to handle reset context
51c93ac 
- it was the check for deletion that was unneeded

Fixes: #10955
@srl295
Merge branch 'chore/core/11112-lone-surrogate' into fix/core/10955-re…
3da900d 
…set-on-frame
@srl295
fix(core): update core to handle reset context
9ca4e99 
- mark event flags as unused for now

Fixes: #10955
@srl295
Merge branch 'beta' into fix/core/10955-reset-on-frame
d0ca92a
@srl295 @rc-swag
Update core/src/state.hpp
46239c6 
Co-authored-by: rc-swag <[email protected]>
@srl295
fix(core): update core to handle reset context
bd10290 
- fixup comment
@srl295
Merge branch 'beta' into fix/core/10955-reset-on-frame
699d576
@srl295
fix(core): update core to handle reset context
4f8c9eb 
- range check vk
- split modifier test out to separate function
@srl295
fix(core): update core to handle reset context
37530ac 
- fix range check vk to use a static instead of c++17 function
@srl295
Merge branch 'beta' into fix/core/10955-reset-on-frame
5c04599
@srl295
fix(core): update core to handle reset context
4f2ef49 
- clear the app context as well as the cached context

Fixes: #10955
@srl295
Merge branch 'beta' into fix/core/10955-reset-on-frame
8d35422
@mcdurdin
fix(developer): support export of visual keyboard when Keyman for Win…
89773e1 
…dows not installed

Fixes #11199.
@mcdurdin
chore(developer): fixup osk xml path
1f38954
@srl295
fix(core): ldml backspace processing should delete all markers
dc965f4 
- current code would only delete a single marker and fall through
- should loop consuming all markers until a non-marker char is hit
@srl295
fix(core): update state_should_invalidate_context
f77bbb2 
- don't invalidate on keyup
- don't check context()->empty()
- clean up structure and comments

Fixes: #10955
@srl295
Merge branch 'beta' into fix/core/10955-reset-on-frame
331ff33
@mcdurdin
chore(developer): temporary copy of osk xml when building installer
1f616a8
@mcdurdin
chore(developer): ignore missing folder when cleaning
57fb66a
@sgschantz
remove openjdk 8 dependency for ios builds
ad6095a
jahorton
jahorton approved these changes May 2, 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.

I don't see any entries for the stuff newly-merged shortly before this PR. Will we need another pass to handle that, or will it come out in the history-wash on release?

HISTORY.md
Comment on lines +113 to +114
* (#11322)
* (#11321)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* (#11322)
* (#11321)
* chore(web): removes old reference-doc from alpha that has completed its purpose (#11322)
* fix(web): gesture-model initial-state, callback failure handling (#11321)

@mcdurdin
Copy link
Member Author

mcdurdin commented May 2, 2024

I don't see any entries for the stuff newly-merged shortly before this PR. Will we need another pass to handle that, or will it come out in the history-wash on release?

Can you be more specific?

@jahorton
Copy link
Contributor

jahorton commented May 2, 2024

I don't see any entries for the stuff newly-merged shortly before this PR. Will we need another pass to handle that, or will it come out in the history-wash on release?

Can you be more specific?

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

@mcdurdin
Copy link
Member Author

mcdurdin commented May 2, 2024

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

history.md is updated at release build time. So that will come through overnight.

@jahorton
Copy link
Contributor

jahorton commented May 2, 2024 •
edited
Loading

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

history.md is updated at release build time. So that will come through overnight.

So, they'll end up as part of... stable-17.0's history.md, I guess? (Assuming we do get to press the big button today, anyway.) I forget if/when we copy that over to master's history.md - that's what's on my mind with this line of discussion.

@mcdurdin
Copy link
Member Author

mcdurdin commented May 2, 2024

They'll be copied over from beta to master when we do one final merge of beta into master. Or we may do it manually if that's the only change.

@jahorton
Copy link
Contributor

jahorton commented May 2, 2024

They'll be copied over from beta to master when we do one final merge of beta into master.

Ah, see, that's what I thought this was. My mistake, I suppose.

@mcdurdin mcdurdin merged commit 0c9a028 into master May 2, 2024
25 checks passed
@mcdurdin mcdurdin deleted the chore/a18s1-merge-beta-into-master branch May 2, 2024 07:58
@keyman-server
Copy link
Collaborator

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

@darcywong00 darcywong00 mentioned this pull request May 9, 2024
Merged
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

@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

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

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

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

Assignees
No one assigned
Labels
chore common/resources/ Build infrastructure common/web/ common/ core/ Keyman Core developer/ ios/app/ ios/engine/ ios/ linux/config/ linux/ mac/ oem/fv/ios/ oem/fv/ oem/ web/ windows/config/ windows/engine/ windows/
Projects
None yet
Milestone
A18S1
Development

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