forked from dashpay/dash
-
Notifications
You must be signed in to change notification settings - Fork 725
[Backport] 5.2.0 backports #2429
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.
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Github-Pull: bitcoin#2259 Rebased-From: 304c915
Github-Pull: bitcoin#2305 Rebased-From: f8764b9
Each FAQ answer content is formatted as a self-contained HTML page for styling purposes, however, having raw HTML in the `.ui` file's `<string>` properties means that said HTML tags are also exported to Transifex. This leads to a very ugly and confusing translation experience that is prone to errors. Here, we split up the content into shorter HTML-less strings: each list item is it's own string, and each paragraph is it's own string. No HTML tags are exported to Transifex. The necessary HTML tags are added by way of helper functions that wrap each string programmatically. Github-Pull: bitcoin#2260 Rebased-From: ea7f593
Github-Pull: bitcoin#2348 Rebased-From: a55f2d0
Github-Pull: bitcoin#2350 Rebased-From: 4f90a19
Github-Pull: bitcoin#2353 Rebased-From: 274fb26
on macOS: listSnapshot was leaking in findStartupItemInList() bitcoinAppUrl was leaking in [Get|Set]StartOnSystemStartup() Github-Pull: bitcoin#2374 Rebased-From: 5c07620
-BEGIN VERIFY SCRIPT- sed -i 's/\<NULL\>/nullptr/g' src/qt/guiutil.cpp -END VERIFY SCRIPT- Github-Pull: bitcoin#2374 Rebased-From: aad1362
The problem arises when we trigger the balance update worker task and the chain tip changes (due a reorg) before one of the threadpool's threads start executing the update task. As the tip in this situation has the same height that the one cached inside the model, the `processBalanceChangeInternal` returns true without setting the processing flag to false again. Blocking every future balance update. Github-Pull: bitcoin#2379 Rebased-From: fbda4d2
Github-Pull: bitcoin#2384 Rebased-From: fc6d7b9
coming from btc@05242e937d3fc0144029ccf3b14f98662400dd60 refs bitcoin#8225 To ensure the GUI closes when the "Minimize on close" window option is disabled, and the "Minimize to the tray instead of the taskbar" window option is enbaled, remove a check made against the "Minimize to the tray instead of the taskbar" value, made during GUI closure. To ensure the GUI minimizes to the taskbar when the "Minimize on close" window option is enabled, and the "Minimize to the tray instead of the taskbar" window option is disabled, minimize the GUI and ignore the closure event. Github-Pull: bitcoin#2377 Rebased-From: d72f7b5
… being banned. Moved TRY_LOCK to LOCK to perform the budget maps check every 14 blocks without exception. If peers doesn't perform the validation and update proposals, votes and budget finalization maps at the same network time, then there could be a peer sending votes that aren't longer valid and end up being banned. Github-Pull: bitcoin#2395 Rebased-From: 7faa5e9
Github-Pull: bitcoin#2401 Rebased-From: b02f0ab
Github-Pull: bitcoin#2401 Rebased-From: 139707b
…and will be removed on September 20, 2021. Moved cmake workflow using Ubuntu 16.04 to Ubuntu 18.04. Github-Pull: bitcoin#2413 Rebased-From: f3fe9b3
random-zebra
approved these changes
Jun 18, 2021
random-zebra
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 3344fb3
Fuzzbawls
approved these changes
Jun 19, 2021
Collaborator
Fuzzbawls
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 3344fb3
1 task
random-zebra
added a commit
that referenced
this pull request
Jun 20, 2021
ef48f03 [Build] Bump gitian descriptor version to 5.2 (Fuzzbawls) Pull request description: Based on top of #2429 so that GA tests pass properly, this sets the gitian descriptor version to `5.2` to match the branch version. - [x] #2429 ACKs for top commit: furszy: ACK ef48f03 random-zebra: utACK ef48f03 Tree-SHA512: f2ea290a9cb3eaf1e5d707d5212b4946f39b19b51f5414abad2f5ae5cd7aefbceacbbe2c7f37b863cfcf28f7b035b4df97bc9a5af4143c13e56fa03dc0686135
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
List of straightforward PRs back ported from v6.0 into the v5.2 branch (ordered by merge date).
currentIndexChanged(QString)obsolete method call. #2259.