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.

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

Rc v1.0.0 #2648

Merged
merged 36 commits into from Apr 15, 2019

Conversation

Projects
None yet
3 participants
@ManfredKarrer
Copy link
Member

commented Apr 4, 2019

This is the preparation branch for v1.0.0.

I have set a new test mainnet genesis. Need to be updated before release ;-).

ManfredKarrer added some commits Apr 4, 2019

Set dao activated by default
We still keep the activation code just in case...
We can clean it up in a later release

@ManfredKarrer ManfredKarrer requested review from ripcurlx and sqrrm Apr 4, 2019

ManfredKarrer and others added some commits Apr 7, 2019

Merge branch 'master' into rc_v1.0.0
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java

@ManfredKarrer ManfredKarrer marked this pull request as ready for review Apr 14, 2019

@ManfredKarrer ManfredKarrer requested a review from cbeams as a code owner Apr 14, 2019

@ManfredKarrer ManfredKarrer changed the title Rc v1.0.0 [WIP] Rc v1.0.0 Apr 14, 2019

ManfredKarrer added some commits Apr 14, 2019

ripcurlx and others added some commits Apr 14, 2019

@ripcurlx
Copy link
Member

left a comment

ACK

@sqrrm

sqrrm approved these changes Apr 15, 2019

Copy link
Member

left a comment

ACK

ripcurlx and others added some commits Apr 15, 2019

Merge pull request #7 from ripcurlx/align-currency-list-with-combobox
Align Altcoin list with Altcoin selection combobox
Merge pull request #6 from ripcurlx/fix-scrolling-in-trade-view
Reduce table height and update height calculation to prevent scrolling

@ManfredKarrer ManfredKarrer removed the request for review from cbeams Apr 15, 2019

@ManfredKarrer ManfredKarrer changed the title [WIP] Rc v1.0.0 Rc v1.0.0 Apr 15, 2019

ManfredKarrer added some commits Apr 15, 2019

@ManfredKarrer ManfredKarrer merged commit 825d374 into bisq-network:master Apr 15, 2019

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@ManfredKarrer ManfredKarrer deleted the ManfredKarrer:rc_v1.0.0 branch Apr 16, 2019

@sqrrm sqrrm referenced this pull request May 7, 2019

Open

Cycle 1 #282

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.