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

merge gpos to develop #186

Merged
merged 23 commits into from
Oct 17, 2019
Merged

merge gpos to develop #186

merged 23 commits into from
Oct 17, 2019

Commits on Aug 20, 2019

  1. Merge pull request #37 from peerplays-network/feature/SONs-base 

    Unit test case fixes
    @pbattu123
    pbattu123 committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    c35a88b View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. issue - 154: Don't allow to vote when vesting balance is 0

    @pbattu123
    pbattu123 committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    8613bab View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. changes to withdraw_vesting feature(for both cdd and GPOS)

    @pbattu123
    pbattu123 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    2a3d8a4 View commit details
    Browse the repository at this point in the history

  2. Comments update

    @pbattu123
    pbattu123 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    b358241 View commit details
    Browse the repository at this point in the history

  3. update to GPOS hardfork ref

    @pbattu123
    pbattu123 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    8e1c038 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2019

  1. Merge pull request #95 from peerplays-network/issue-154 

    issue - 157: Don't allow to vote when the vesting balance is 0
    @pbattu123
    pbattu123 committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    9ec835b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #141 from peerplays-network/BLOCKBACK-153 

    Issue Blockback 153 fix
    @pbattu123
    pbattu123 committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    79dc2f4 View commit details
    Browse the repository at this point in the history

  3. fix for get_vesting_balance API call

    @pbattu123
    pbattu123 committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    4a72f94 View commit details
    Browse the repository at this point in the history

  4. braces update

    @pbattu123
    pbattu123 committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    a7df686 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2019

  1. Merge pull request #143 from peerplays-network/issue/154-fix 

    Issue/154 fix
    @pbattu123
    pbattu123 committed Sep 22, 2019
    Configuration menu
    Copy the full SHA
    af47ed0 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Create .gitlab-ci.yml

    Roshan Syed committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    db01f31 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2019

  1. fixing build errors (#150) 

    * fixing build errors

vest type correction

* fixing build errors

vest type correction

* fixes 

new Dockerfile

* vesting_balance_type correction

vesting_balance_type changed to normal

* gcc5 support to Dockerfile

gcc5 support to Dockerfile
    @bobinson
    bobinson committed Sep 26, 2019
    Configuration menu
    Copy the full SHA
    7fae375 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. Changes to compiple with GCC 7(Ubuntu 18.04)

    @pbattu123
    pbattu123 committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    f1eb625 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. changes to have separate methods and single withdrawl fee for multipl… 

    …e vest objects
    @pbattu123
    pbattu123 committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    d65f20a View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. 163-fix, Return only non-zero vesting balances

    @pbattu123
    pbattu123 committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    c73d0a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2019

  1. Merge pull request #164 from peerplays-network/jira-163-fix 

    163-fix, Return only non-zero vesting balances
    @pbattu123
    pbattu123 committed Oct 6, 2019
    Configuration menu
    Copy the full SHA
    3f6b7ab View commit details
    Browse the repository at this point in the history

  2. Merge pull request #163 from peerplays-network/153/fix-add-on 

    Changes to have separate withdraw_vesting methods and single withdraw fee for multiple objects
    @pbattu123
    pbattu123 committed Oct 6, 2019
    Configuration menu
    Copy the full SHA
    d5dffa6 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. Merge branch 'qa_gpos_18.04' into develop_gpos

    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    0dc551b View commit details
    Browse the repository at this point in the history

  2. Revert "Revert "GPOS protocol"" 

    This reverts commit 6761641.
    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    152c793 View commit details
    Browse the repository at this point in the history

  3. add new line needed to gpos hardfork file

    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    803ef15 View commit details
    Browse the repository at this point in the history

  4. comment temporally cli_vote_for_2_witnesses until refactor or delete

    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    76557b4 View commit details
    Browse the repository at this point in the history

  5. fix gpos tests

    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    60f4999 View commit details
    Browse the repository at this point in the history

  6. fix gitlab-ci conflict

    @oxarbitrage
    oxarbitrage committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    37292ae View commit details
    Browse the repository at this point in the history