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

Release/v1.2.4 #3756

Merged
merged 18 commits into from
Dec 6, 2019
Merged

Release/v1.2.4 #3756

merged 18 commits into from
Dec 6, 2019

Conversation

ripcurlx
Copy link
Contributor

@ripcurlx ripcurlx commented Dec 6, 2019

No description provided.

ripcurlx and others added 18 commits November 27, 2019 08:51
@ripcurlx
Update bitcoinj checkpoints file
cf3a13e
@ripcurlx
Update translations
c131a89
@ripcurlx
Update data stores
3b38417
@chimp1984 @ripcurlx
Use 2of2 multisig deposit tx version for manual payout
88cbecd 
With v1.2 we use 2of2 multisig for deposit tx. This commit changes the
manual payout window to reflect that.

- Remove unused code from legacy arbitration
- Fix comments
@ripcurlx
Replace arbitration link in tac
548a217 
With link to v1.2 dispute resolution documentation.
@chimp1984 @ripcurlx
Do not add an output if value is 0 BTC
fdc582a 
Fixes #3721 and
#3722

There are still more issues as such a payout tx will cause that the
trade ends up in failed trades. This commit only fixes the invalid
tx issue.
@chimp1984 @ripcurlx
Refactoring: Replace isGreaterThan(Coin.ZERO) with isPositive()
04c0258
@chimp1984 @ripcurlx
Do not display confirmation icon for 0 BTC tx
5fa88cc 
If we do not get any BTC from a mediated payout tx we do not know about
the confirmation state so it would stay always in the unconfirmed state.
To avoid that confusion we prefer to hide the icon. This is a known
issue from BitcoinJ but we have not found a solution for that yet.
@chimp1984 @ripcurlx
Add handling of mediationResultState to isFundsLockedIn
c2e8806 
Fixes #3721
(part of the problem was that the trade ended up in failed trade)

Refactor method and add comments.
We did not handle the case of a mediated payout. isPayoutPublished() is
only reflecting non-disputed trade payouts.
@wiz @ripcurlx
Fix language tags so script and regional variants work correctly
0bf75ae
@wiz @ripcurlx
Adjust update_translations.sh language tags for script/regional variants
ba492b8
@wiz @ripcurlx
Add zh-hant translations (Chinese Traditional)
2d18800
@wiz @ripcurlx
Add Chinese Traditional file to update_translations.sh script
f0cbddc
@ripcurlx
Bump version number to v1.2.4
5880ad9
@freimair @ripcurlx
Fix memory leak
dbf621a 
We had a small memory leak in the code base. Namely, there have been some
threadpools in use but not shutdown when they have been no longer needed.
Result was that the threads and the parent threads have been kept alive
which lead to hundreds of stale threads over the course of several days.
@ripcurlx
Update data stores, translations and bitcoinj checkpoints (#3748)
acd4350 
* Update bitcoinj checkpoint file

* Update translations

* Update data stores
@ripcurlx
Revert to SNAPSHOT version
24d36fc
@ripcurlx
Merge branch 'master' of github.com:bisq-network/bisq into release/v1…
44b4f42 
….2.4

# Conflicts:
#	core/src/main/resources/i18n/displayStrings_zh-hant.properties
@ripcurlx ripcurlx requested a review from sqrrm as a code owner December 6, 2019 10:31
freimair
freimair approved these changes Dec 6, 2019
View reviewed changes
Copy link
Member

@freimair freimair left a comment

Choose a reason for hiding this comment

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

utAck

@ripcurlx ripcurlx merged commit 0cfa7f6 into master Dec 6, 2019
@freimair freimair mentioned this pull request Dec 6, 2019
Closed
@julianknutsen
Copy link
Contributor

@ripcurlx

Is this the standard way that every release branch is done?

  1. Commit changes to master
  2. Cherry pick changes from master->branch
  3. Add release-only changes such as translations, version numbers, data stores on branch
  4. Merge release-only changes to master after release

What happens if there are changes that are only on the branch because master has changed by the time the merge happens? Who handles the merge?

What is the downside of adding all the changes that were originally just on the branch to go to master first and cherry-picked to the branch?

I know there are a ton of branching models so just want to understand this one :)

@ripcurlx ripcurlx deleted the release/v1.2.4 branch January 3, 2020 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@freimair freimair freimair approved these changes

@sqrrm sqrrm Awaiting requested review from sqrrm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ripcurlx @julianknutsen @freimair @chimp1984 @wiz