Merge master into develop - #2630
Merged
Merged
Conversation
Prepare 0.12.3.3 critical bugfix release
This will reset testnet so that we can start with a clean state.
…testnet As we reset testnet, we can also remove the special handling for old blocks.
Reset/Fork testnet to block 4000 and prepare v0.12.3.4 release
Add owner and voting addresses to rpc output, unify it across different methods. Also fix keyid option in `masternode list` rpc.
* fix source files * make translate: en strings * ru * fi * vi * pl * bg, de, it, ko, nl, sk, tr, zh_CN * es, th * ar dash_ar.ts: Mismatch between 'Are you sure you want to start masternode %1?' and 'هل أنت متأكد أنك تريد بدء ماسترنود 1%؟' dash_ar.ts: Mismatch between 'Output debugging information (default: %u, supplying <category> is optional)' and 'معلومات تصحيح الخرج <category>ا(ختياري)' * ar, es, pt, tr dash_ar.ts: Mismatch between 'Are you sure you want to start masternode %1?' and 'هل أنت متأكد أنك تريد بدء ماسترنود 1%؟' dash_ar.ts: Mismatch between 'Output debugging information (default: %u, supplying <category> is optional)' and 'معلومات تصحيح الخرج * fi * fr, zh_TW * ja
…quested (dashpay#2622) (dashpay#2624) * Remove support for "0" as an alternative to "" when the default is requested * Update src/rpc/rpcevo.cpp Co-Authored-By: codablock <ablock84@gmail.com>
* Update 0.13.0.0 release notes * Apply suggestions from code review Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com> * add latest commits
* Add `Mining` section to `Notable changes`, mention P2SH and `script` in `getblocktemplate` * Also mention `coinbase_payload`
Merge branch 'master' into `v0.13.0.x`
This reverts commit b5670c4.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Merges everything from
masterup to 942838e (currenttipHEAD) which in reality means backporting recent translations and release notes updates, as well as bumping immer to c89819df92191d6969a6a22c88c72943b8e25016 (this can be seen as a more compact alternative to #2625 which can be closed after this one is merged or it would most likely need rebasing otherwise) because everything else is already merged via separate PRs/fixes or was backported fromdevelopor should simply be ignored (like version bumps or code changes for compatibility code that was dropped earlier for example). This also reverts #2591 to keepreleaseflagfalse.Note: many of translated string are not needed anymore (a lot of compatibility code is gone now), they will simply be ignored on compilation, this should not cause any issues. We'll drop them from
*.tsfiles via a regularTranslations2019xxPR later.