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

Backport: Bring bug fixes into 2.5.4 #4567

Merged
merged 3 commits into from
Apr 9, 2020
Merged

Backport: Bring bug fixes into 2.5.4 #4567

merged 3 commits into from
Apr 9, 2020

Conversation

droidmonkey
Copy link
Member

Type of change

  • ✅ Bug fix (non-breaking change which fixes an issue)

Description and Context

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • ✅ My change requires a change to the documentation, and I have updated it accordingly.
  • ✅ I have added tests to cover my changes.

Sigmaupsilon and others added 2 commits April 9, 2020 10:53
@Sigmaupsilon @droidmonkey
Return keyboard focus after saving database edits (#4287)
d44cce5
@droidmonkey
Only use bare minimum settings for portable version
8b53995 
* Fixes #4103

* This ini file ensures the portable distribution populates with the default settings from the code and not from outdated ini file.
@droidmonkey droidmonkey added the bug label Apr 9, 2020
@droidmonkey droidmonkey added this to the v2.5.4 milestone Apr 9, 2020
@droidmonkey droidmonkey requested a review from phoerious April 9, 2020 15:02
@droidmonkey droidmonkey changed the base branch from develop to release/2.5.4 April 9, 2020 15:03
@phoerious phoerious added the pr: backported Pull request backported to previous release label Apr 9, 2020
@phoerious phoerious merged commit a362c08 into release/2.5.4 Apr 9, 2020
@phoerious phoerious deleted the hotfix/backports branch April 9, 2020 16:15
@phoerious phoerious added pr: bugfix Pull request that fixes a bug and removed bug labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phoerious phoerious phoerious approved these changes

Assignees
No one assigned
Labels
pr: backported Pull request backported to previous release pr: bugfix Pull request that fixes a bug
Projects
None yet
Milestone
v2.5.4
Development

Successfully merging this pull request may close these issues.
3 participants
@droidmonkey @phoerious @Sigmaupsilon