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

Etomic #26

Merged
merged 35 commits into from
Apr 11, 2018
Merged

Etomic #26

merged 35 commits into from
Apr 11, 2018

Commits on Mar 19, 2018

  1. Merge pull request #696 from jl777/dev 

    -prints
    @jl777
    jl777 committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    ed5c6f5 View commit details
    Browse the repository at this point in the history

  2. -print

    @jl777
    jl777 committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    ca6709f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #698 from jl777/dev 

    notarize at least every 100 blocks
    @jl777
    jl777 committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    88d824e View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Merge pull request #701 from jl777/dev 

    Dev
    @jl777
    jl777 committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    0f2f044 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #703 from jl777/dev 

    Dev
    @jl777
    jl777 committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    a9d823a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #705 from jl777/dev 

    Dev
    @jl777
    jl777 committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    a07b6f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Merge pull request #708 from jl777/dev 

    Dev
    @jl777
    jl777 committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    2f77cfd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #713 from jl777/dev 

    Fix mainnet MoM CPU usage
    @jl777
    jl777 committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    8eb0d0d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2018

  1. Merge pull request #726 from jl777/dev 

    bugfixes
    @jl777
    jl777 committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    e080161 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Merge pull request #739 from jl777/dev 

    reduce notarizing txfee, among many other changes
    @jl777
    jl777 committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    ba557bf View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. Test

    @jl777
    jl777 committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    c2c761b View commit details
    Browse the repository at this point in the history

  2. Revert "Test" 

    This reverts commit c2c761b.
    @jl777
    jl777 committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    344f3b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Update m_splitfund to use 10000 instead of 50000

    @lukechilds
    lukechilds committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    2f3dc3b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #744 from lukechilds/patch-1 

    Update m_splitfund to use 10000 instead of 50000
    @jl777
    jl777 committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    815715a View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Test

    @jl777
    jl777 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    3e28dd8 View commit details
    Browse the repository at this point in the history

  2. Use autofee flag

    @jl777
    jl777 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    7db6559 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Revert order book/portfolio fast flag

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    8b17874 View commit details
    Browse the repository at this point in the history

  2. Uuid to pending object

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    054e6fd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into jl777

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    bd65d22 View commit details
    Browse the repository at this point in the history

  4. Increase notary signatures

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    e9c0619 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #749 from jl777/jl777 

    Jl777
    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    1c2bd98 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #750 from jl777/dev 

    Dev
    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    c04550d View commit details
    Browse the repository at this point in the history

  7. FROMGUI

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    3561957 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #751 from jl777/jl777 

    FROMGUI
    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    fa5901e View commit details
    Browse the repository at this point in the history

  9. Test

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    1c9d976 View commit details
    Browse the repository at this point in the history

  10. Test

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    39cb251 View commit details
    Browse the repository at this point in the history

  11. BNTN, CHAIN, PRLPAY chains

    @kolobus
    kolobus committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    99b3ea1 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #752 from jl777/kolo-assets-new 

    BNTN, CHAIN, PRLPAY chains
    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    fa5e488 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'dev' into jl777

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    e91e63b View commit details
    Browse the repository at this point in the history

  14. Merge pull request #753 from jl777/jl777 

    Jl777
    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    2ae4dfe View commit details
    Browse the repository at this point in the history

  15. Merge branch 'beta' into dev

    @jl777
    jl777 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    e1b7fb7 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. There is no need to use ./run to be bob

    @jl777
    jl777 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    b7264cc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #755 from jl777/jl777 

    There is no need to use ./run to be bob
    @jl777
    jl777 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    4eeec72 View commit details
    Browse the repository at this point in the history

  3. Merge jl777 dev.

    @artemii235
    artemii235 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    1928ad5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/etomic' into etomic

    @artemii235
    artemii235 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    c230682 View commit details
    Browse the repository at this point in the history