Skip to content

[backport] Backport fixes from master to elements-22.x for rc4 #1147

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 11 commits into from
Aug 18, 2022

Conversation

psgreco
Copy link
Contributor

@psgreco psgreco commented Aug 18, 2022

Backport #1140 #1141 #1145 and #1146 from master.
Fix manpages
Bump to -rc4

psgreco and others added 11 commits August 11, 2022 21:29
7fb99ff Fix Icon position in dmg (Pablo Greco)

Pull request description:

  Mac installer is showing the elements icon in a bad position
  ![image](https://user-images.githubusercontent.com/12950210/184251990-2496a5fc-de3a-450f-88d7-bce4188224f2.png)

  This small fix puts it back where it should be
  ![image](https://user-images.githubusercontent.com/12950210/184252039-0455a9ce-39f8-44cf-8d78-e8b1669e15e3.png)

ACKs for top commit:
  apoelstra:
    utACK 7fb99ff. Confirmed that it only touches Mac stuff.

Tree-SHA512: cbe3cd3ae4b5d461dc7f993ca0ea11f6ff1759a616d4d96d3a7ca9eda59cd2dc8e6664f2708d168bc9d84a8158adef73d0c995d6a8d40fd31311e4591f6747fd
In elements tapscript is verison 0xc4
…-blockstream-patch-1

Fix tapscript comment
Fixing issuance cases and half blinded cases in PSET
…_1144

Elements-qt: Fix arrows to increase/decrease Amount
@psgreco psgreco requested review from gwillen and apoelstra August 18, 2022 18:30
Copy link
Member

@delta1 delta1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 85c25b1

confirmed the changes match the PR description

  • backports
  • man pages
  • RC version

@apoelstra apoelstra merged commit 580230f into ElementsProject:elements-22.x Aug 18, 2022
@psgreco psgreco deleted the elements-22-rc4 branch September 1, 2022 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants