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 web-core 🎼 #13096

Merged
merged 251 commits into from
Jan 30, 2025
Merged

chore: merge master into web-core 🎼 #13096

merged 251 commits into from
Jan 30, 2025

Conversation

keyman-server
Copy link
Collaborator

markcsinclair and others added 30 commits December 9, 2024 16:16
@markcsinclair
chore(common/web): add initElemElement and first true test case for i…
13b463a 
…sEqual()
@markcsinclair
chore(common/web): Merge branch 'master' into test/common/web/types/9…
3ad9fd2 
…052-unit-tests-element-string
@markcsinclair
chore(common/web): add five test cases for ElemElement.isEqual()
ee23da5
@markcsinclair
chore(common/web): add first test case for ElementString()
77076eb
@markcsinclair
chore(common/web): add use case for string array
703fd2c
@markcsinclair
chore(common/web): add test case for fromStrings() from string
76316f1
@markcsinclair
chore(common/web): remove unneeded local variables
09168fc
@markcsinclair
chore(common/web): add four test cases for order andf tertiary argume…
5e4d699 
…nts to fromStrings()
@markcsinclair
chore(common/web): add four test cases for tertiary_base and prebase …
aef4ef4 
…arguments to fromStrings()
@rc-swag
fix(windows): bool return value of KeymanIsTextSelected
725bfa7
@markcsinclair
chore(common/web): stub out strs.allocString()
e6abbf0
@markcsinclair
chore(common/web): add four test cases for order etc strings that are…
0585b3f 
… too short
@markcsinclair
chore(common/web): add test cases for non-number in order and tertiar…
1ae53a0 
…y strings
@markcsinclair
chore(common/web): add first uset test case with supporting stubs and…
7694623 
… TestUnicodeSetParser class
@markcsinclair
chore(common/web): corrected nesting error, and moved more code into …
9569ef2 
…fixtures
@markcsinclair
chore(common/web): stub the ElementParser.segment for uset
58e5f0f
@markcsinclair
chore(common/web): add two test cases for uset parse failures
e169ece
@markcsinclair
chore(common/web): Merge branch 'master' into test/common/web/types/9…
6f4ad91 
…052-unit-tests-element-string
@markcsinclair
chore(common/web): add test case for quad string in ElementString.fro…
80d2f49 
…mStrings()
@markcsinclair
chore(common/web): add test cases for ElemElement.isEqual() and Eleme…
c615f82 
…ntStrings.isEqual()
@markcsinclair
chore(common/web): add two more test cases for ElementString.isEqual()
704486a
@markcsinclair
chore(common/web): add test case for string ElemElement
86095d4
@markcsinclair
chore(common/web): clarify describe strings
23b3de1
@markcsinclair
chore(common/web): introduce initElementString() to remove dependency…
9d555a0 
… on fromStrings() in isEqual() tests
@markcsinclair
chore(common/web): Merge branch 'master' into test/common/web/types/9…
98dbdca 
…052-unit-tests-element-string
@markcsinclair
fix(common/web): add isEqual() method to StrsItem and use it in ElemE…
b9c7835 
…lement.isEqual()
@sgschantz
chore(mac): reworked sentry testing
8e833c8 
can now force crashes or send messages by typing a
single character when sentry testing is enabled
in the UserDefaults
@markcsinclair
chore(common/web): Merge branch 'master' into fix/common/web/types/12…
783b474 
…867-add-StrsItem-isEqual-method
@markcsinclair
chore(common/web): Merge branch 'master' into test/common/web/types/9…
aa29bea 
…052-unit-tests-element-string
@markcsinclair
fix(common/web): add ElementString.parseIntOrZero() method to handle …
a279767 
…invalid order and tertiary params
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Jan 30, 2025 •
edited
Loading

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot changed the title chore: merge master into web-core chore: merge master into web-core 🎼 Jan 30, 2025
@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S20 milestone Jan 30, 2025
@github-actions github-actions bot added the chore label Jan 30, 2025
@ermshiperete
Copy link
Contributor

I don't know why GH complained about merge conflicts - the command line was perfectly fine with the merge. What changed was that epic/web-core had renamed kbdInterface.ts to jsKeyboardInterface.ts, so that the changes that were made in kbdInterface.ts had to be applied to jsKeyboardInterface.ts which git was able to do without problems...

@mcdurdin
Copy link
Member

Yeah GH struggles to handle rename merge conflicts -- glad it was simple to resolve on cmdline

@mcdurdin mcdurdin merged commit 0cf91b2 into epic/web-core Jan 30, 2025
27 of 28 checks passed
@mcdurdin mcdurdin deleted the chore/merge-master-into-web-core branch January 30, 2025 23:00
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

@srl295 srl295 Awaiting requested review from srl295 srl295 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

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

Assignees
No one assigned
Labels
android/app/ android/engine/ android/ chore common/resources/ Build infrastructure common/web/ common/ developer/compilers/ developer/ide/ developer/ epic-web-core ios/engine/ ios/ linux/engine/ linux/ mac/ web/ windows/config/ windows/engine/ windows/
Projects
Keyman
Archived in project
Milestone
A18S20
Development

Successfully merging this pull request may close these issues.
10 participants
@keyman-server @ermshiperete @mcdurdin @markcsinclair @rc-swag @sgschantz @jahorton @darcywong00 @srl295 @Meng-Heng