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

update master #97

Merged
merged 36 commits into from Dec 10, 2018
Merged

update master #97

merged 36 commits into from Dec 10, 2018

Commits on Dec 6, 2018

  1. Merge branch 'FSM' into jl777

    @jl777
    jl777 committed Dec 6, 2018
    Copy the full SHA
    9b0ee5f View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2018

  1. Merge branch 'FSM' into jl777

    @jl777
    jl777 committed Dec 7, 2018
    Copy the full SHA
    f0cc5e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2018

  1. Merge branch 'beta' into dev

    @jl777
    jl777 committed Dec 8, 2018
    Copy the full SHA
    0b1a452 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into FSM

    @jl777
    jl777 committed Dec 8, 2018
    Copy the full SHA
    e831503 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'FSM' into jl777

    @jl777
    jl777 committed Dec 8, 2018
    Copy the full SHA
    07921af View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2018

  1. Update three

    @jl777
    jl777 committed Dec 9, 2018
    Copy the full SHA
    5ea3f23 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1051 from jl777/jl777 

    Jl777
    @jl777
    jl777 committed Dec 9, 2018
    Copy the full SHA
    239d9d3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1052 from jl777/FSM 

    FSM
    @jl777
    jl777 committed Dec 9, 2018
    Copy the full SHA
    9f0c084 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1053 from jl777/dev 

    Merge branch 'beta' into dev
    @jl777
    jl777 committed Dec 9, 2018
    Copy the full SHA
    f9cbbf9 View commit details
    Browse the repository at this point in the history

  5. genproclimit fix 

    by default when we start komodod only with -gen arg
genproclimit automatically become -1. this behaviour derived
from VRSC after last merge (as i remember, vrsc has -1 by default,
0 - for staking, and >= 1 - for mining and staking), so we need
to set genproclimit=1 if we pass gen and want to actually start
mining.
    @DeckerSU
    DeckerSU committed Dec 9, 2018
    Copy the full SHA
    01a684c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1054 from DeckerSU/generate-fix 

    genproclimit fix
    @jl777
    jl777 committed Dec 9, 2018
    Copy the full SHA
    1c83c86 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Revert txfee changes

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    a2ea9de View commit details
    Browse the repository at this point in the history

  2. Merge branch 'FSM' into jl777

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    5a1e12d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1055 from jl777/FSM 

    Revert txfee changes
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    b10a049 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1056 from jl777/dev 

    Dev
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    43cb92b View commit details
    Browse the repository at this point in the history

  5. Fix typow == 0

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    27606f3 View commit details
    Browse the repository at this point in the history

  6. +print

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    fcb709c View commit details
    Browse the repository at this point in the history

  7. New prints

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    8019824 View commit details
    Browse the repository at this point in the history

  8. Fix

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    fe06711 View commit details
    Browse the repository at this point in the history

  9. ->

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    755e64a View commit details
    Browse the repository at this point in the history

  10. Fix

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    7c88285 View commit details
    Browse the repository at this point in the history

  11. Move prints

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    2b66bcf View commit details
    Browse the repository at this point in the history

  12. Print orderpos

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    7883afa View commit details
    Browse the repository at this point in the history

  13. +prints

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    181d6b3 View commit details
    Browse the repository at this point in the history

  14. +print

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    0615c21 View commit details
    Browse the repository at this point in the history

  15. +print

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    5f162b1 View commit details
    Browse the repository at this point in the history

  16. Allow one change out in list transactions

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    3b4ee13 View commit details
    Browse the repository at this point in the history

  17. -print

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    80be594 View commit details
    Browse the repository at this point in the history

  18. -prints

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    9742bb7 View commit details
    Browse the repository at this point in the history

  19. Fix rewards claim txid not appearing in list transactions

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    3958b39 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #1057 from jl777/jl777 

    fix missing rewards txid
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    2c75acc View commit details
    Browse the repository at this point in the history

  21. Merge pull request #1058 from jl777/FSM 

    FSM
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    162e04c View commit details
    Browse the repository at this point in the history

  22. Merge pull request #1059 from jl777/dev 

    Dev
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    8722a14 View commit details
    Browse the repository at this point in the history

  23. 0.3.1

    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    5215b63 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #1060 from jl777/dev 

    0.3.1
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    89e68a8 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #1061 from jl777/beta 

    0.3.1
    @jl777
    jl777 committed Dec 10, 2018
    Copy the full SHA
    b2ac875 View commit details
    Browse the repository at this point in the history