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

Merge 24.03 release branch #3628

Merged
11 commits merged into from
Mar 21, 2024
Merged

Merge 24.03 release branch #3628

11 commits merged into from
Mar 21, 2024

Conversation

mmilata
Copy link
Member

@mmilata mmilata commented Mar 20, 2024

Please merge & push manually so that the merge commit is preserved. Previous release: #3401

mmilata and others added 9 commits February 27, 2024 11:39
@mmilata
docs(core): changelog for 2.6.5
1746fe0
@mmilata
chore(common): set definition timestamp to the current signed definit…
6b821a8 
…ions

[no changelog]
@mmilata
feat(core): Add Capability.Translations to Features
1fddb0b 
[no changelog]

(cherry picked from commit 4812402)
@mmilata
fix(core): workaround umlauts not being cleared
6ae158c 
[no changelog]

(cherry picked from commit d790354)
@mmilata
ci: allow running workflows manually
a784c40 
[skip_ci]

(cherry picked from commit 4c40cb2)
@TychoVrahe @mmilata
chore(core): bump fw and fix version due to storage migration
1f67c1e 
[no changelog]

(cherry picked from commit ffabee2)
@mmilata
docs(core): fix version in changelogs
ca5d852
@mmilata
fix(core): add production pubkeys for translations
45e8a84 
[no changelog]

(cherry picked from commit bfacd07)
@matejcik
chore(core): add translation signatures
87894ae
@mmilata mmilata requested a review from matejcik as a code owner March 20, 2024 13:05
@mmilata mmilata self-assigned this Mar 20, 2024
@prusnak
Copy link
Member

prusnak commented Mar 20, 2024

Not possible because there are new commits in main now.

@mmilata mmilata force-pushed the mmilata/merge-release-24.03 branch from 411b89e to 68ff90c Compare March 20, 2024 22:52
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 20, 2024 •
edited
Loading

core UI changes device test click test persistence test
T2T1 Model T test(screens) main(screens) test(screens) main(screens) test(screens) main(screens)
T2B1 Safe 3 3280 test(screens) main(screens) 2724
T3T1 test(screens) main(screens) test(screens) main(screens) test(screens) main(screens)
All main(screens)

@github-actions GitHub Actions
Copy link

legacy UI changes device test(screens) main(screens)

@mmilata
Copy link
Member Author

mmilata commented Mar 21, 2024

Try now please.

@prusnak prusnak closed this pull request by merging all changes into main in 8a45a22 Mar 21, 2024
@prusnak prusnak deleted the mmilata/merge-release-24.03 branch March 21, 2024 07:44
@mmilata mmilata mentioned this pull request Jun 15, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Assignees

@mmilata mmilata

Labels
None yet
Projects
Firmware
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mmilata @prusnak @TychoVrahe @matejcik