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 release to master #617

Merged
merged 72 commits into from
Feb 1, 2018
Merged

Merge release to master #617

merged 72 commits into from
Feb 1, 2018

Commits on Jul 23, 2017

  1. fix vote_id_type might be uninitialized #25

    @takaaki7
    takaaki7 committed Jul 23, 2017
    Configuration menu
    Copy the full SHA
    b4b8dfd View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2017

  1. Add get_account_history_by_operations

    朱礼廷 committed Oct 18, 2017
    Configuration menu
    Copy the full SHA
    55e5276 View commit details
    Browse the repository at this point in the history

  2. no message

    朱礼廷 committed Oct 18, 2017
    Configuration menu
    Copy the full SHA
    f6e0e7d View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. move version command code

    @oxarbitrage
    oxarbitrage committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    03bf95a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Fix windows build issue due to PERLLIB #532

    @abitmore
    abitmore committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    a2c3756 View commit details
    Browse the repository at this point in the history

  2. update document for get_account_history_by_operations

    albert committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    63da266 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #536 from oxarbitrage/issue535 

    move version command code
    @oxarbitrage
    oxarbitrage committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    7a88cdb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #538 from bitshares/532-win-build-perllib 

    Fix windows build issue due to PERLLIB #532
    @abitmore
    abitmore committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    3e0ef5b View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2017

  1. Update parameter name and document for get_account_history_by_operations

    albert committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    46e115b View commit details
    Browse the repository at this point in the history

  2. Update get_account_history_by_operations, return limit operation history

    albert committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    84ddcce View commit details
    Browse the repository at this point in the history

  3. update while condition

    albert committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    9b47aa5 View commit details
    Browse the repository at this point in the history

  4. Fix an error for get_account_history_by_operations

    albert committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    e4fb550 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2017

  1. add a counter to stop infinite loop

    albert committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    a42779c View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. update get_account_history_by_operations 

    delete log
    albert committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    a5222aa View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. remove the counter ilog

    albert committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    7caec24 View commit details
    Browse the repository at this point in the history

  2. remove counter, use start for loop condition

    albert committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    b136e81 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #430 from zhuliting/develop 

    add wallet api get_account_history_by_operations for exchanges
    @oxarbitrage
    oxarbitrage committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    f9af1b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2017

  1. Added unit test to reproducee the OP in issue #338

    @pmconrad
    pmconrad committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    72032c6 View commit details
    Browse the repository at this point in the history

  2. Added log message for bad order matching in margin calls

    @pmconrad
    pmconrad committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    3ce2a38 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2017

  1. Merge pull request #547 from pmconrad/issue_338_test 

    Unit test for issue #338
    @oxarbitrage
    oxarbitrage committed Dec 23, 2017
    Configuration menu
    Copy the full SHA
    f4e8207 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #546 from pmconrad/issue_453_log 

    Log message for issue #453
    @oxarbitrage
    oxarbitrage committed Dec 23, 2017
    Configuration menu
    Copy the full SHA
    10a15ca View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2017

  1. change proposal index from non unique to unique composite key in by_e… 

    …xpiration
    @oxarbitrage
    oxarbitrage committed Dec 24, 2017
    Configuration menu
    Copy the full SHA
    f170f52 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2017

  1. Merge pull request #551 from oxarbitrage/change-proposal-index 

    change proposal index from non unique to unique composite key
    @oxarbitrage
    oxarbitrage committed Dec 26, 2017
    Configuration menu
    Copy the full SHA
    bb275db View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2018

  1. update assert log for transfer

    albert committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    de76b16 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #557 from zhuliting/develop 

    update assert log for transfer
    @oxarbitrage
    oxarbitrage committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    a6d24bc View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. Update Readme 

    replace #548
    @oxarbitrage
    oxarbitrage committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    23c10e8 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Log when #531b413 happens

    @pmconrad
    pmconrad committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f64c7e3 View commit details
    Browse the repository at this point in the history

  2. Remove obsolete pre-hf protection from #531b413

    @pmconrad
    pmconrad committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    1bee14a View commit details
    Browse the repository at this point in the history

  3. Revert "Prevent bid_collateral from executing through proposal before… 

    … hardfork"

This reverts commit a605c5f.
    @pmconrad
    pmconrad committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ccbca02 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. [docker] also build other binaries, not just witness_node

    @xeroc
    xeroc committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    a0c7d1c View commit details
    Browse the repository at this point in the history

  2. [docker] Expose proper docker p2p port

    @xeroc
    xeroc committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    0cefca8 View commit details
    Browse the repository at this point in the history

  3. [docker] Properly use --plugins from environment

    @xeroc
    xeroc committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    d618641 View commit details
    Browse the repository at this point in the history

  4. [docker] separated README

    @xeroc
    xeroc committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    872dd0c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #562 from bitshares/oxarbitrage-patch-7 

    Update Readme
    @oxarbitrage
    oxarbitrage committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    4e302f1 View commit details
    Browse the repository at this point in the history

  6. Revert "Softfork for #433 protection until hardfork" 

    This reverts commit 41b2f31 (except the test case).
    @pmconrad
    pmconrad committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b55ff1d View commit details
    Browse the repository at this point in the history

  7. Test case for get_required_signatures API, #567

    @abitmore
    abitmore committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    ecedfc5 View commit details
    Browse the repository at this point in the history

  8. Move owner check from API to transaction.cpp, #567

    @abitmore
    abitmore committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    a231758 View commit details
    Browse the repository at this point in the history

  9. Add fill_price for settlement order matching, #563

    @abitmore
    abitmore committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    6f377a8 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. More precise logging for #353

    @pmconrad
    pmconrad committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    af6bb88 View commit details
    Browse the repository at this point in the history

  2. Remove hardfork protection for #353

    @pmconrad
    pmconrad committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    09f5eab View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. Merge pull request #568 from bitshares/docker-updates-201801 

    Docker updates 201801
    @oxarbitrage
    oxarbitrage committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    77090df View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2018

  1. Merge pull request #333 from takaaki7/vote_id_type_validation 

    Fix vote_id_type might be uninitialized #25
    @abitmore
    abitmore committed Jan 13, 2018
    Configuration menu
    Copy the full SHA
    a4e19bc View commit details
    Browse the repository at this point in the history

  2. Test case for vote_id_type initialization. #577

    @abitmore
    abitmore committed Jan 13, 2018
    Configuration menu
    Copy the full SHA
    4797615 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. Improve test case for vote_id initialization. #577

    @abitmore
    abitmore committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    49e9b1b View commit details
    Browse the repository at this point in the history

  2. Capture exceptions when initializing vote_id. #577

    @abitmore
    abitmore committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    3d3b2bb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #573 from pmconrad/cleanup_hf 

    Cleanup some obsolete hardfork protections
    @pmconrad
    pmconrad committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    e8f0114 View commit details
    Browse the repository at this point in the history

  4. Test case about unnecessary active keys, #197

    @abitmore
    abitmore committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    2d9c5cf View commit details
    Browse the repository at this point in the history

  5. get_required_authorities: active -= owner. #197

    @abitmore
    abitmore committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    066eb48 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. Tests for #200 get sigs for partially signed trx

    @abitmore
    abitmore committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    87cb344 View commit details
    Browse the repository at this point in the history

  2. get_required_sigs: don't return signed keys. #200

    @abitmore
    abitmore committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    97fe720 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Test case for #584: parent owner key can not auth

    @abitmore
    abitmore committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    ba18ff4 View commit details
    Browse the repository at this point in the history

  2. More tests for #584: parent owner key can not auth

    @abitmore
    abitmore committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    08cbaf3 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2018

  1. fix db_notify.cpp not included in GRAPHENE_DISABLE_UNITY_BUILD set

    lubos.ilcik committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    d53279b View commit details
    Browse the repository at this point in the history

  2. Change assert() to FC_ASSERT in db_block.cpp, #511

    @abitmore
    abitmore committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    68996fb View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. bump fc to last version

    @oxarbitrage
    oxarbitrage committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    744a2d7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #593 from oxarbitrage/fc-9_2 

    bump fc to last version
    @abitmore
    abitmore committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    4076fe7 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Merge pull request #574 from pmconrad/cleanup_353 

    Cleanup for issue 353
    @oxarbitrage
    oxarbitrage committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    10bb3a3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #591 from abitmore/511-assert-db-block 

    Partially fix #511 assert() issue
    @oxarbitrage
    oxarbitrage committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    02a4499 View commit details
    Browse the repository at this point in the history

  3. Change doubles in market API to string. #144

    @abitmore
    abitmore committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    c55ee9b View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Change CLI to adapt market API change. #144

    @abitmore
    abitmore committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    d0297ee View commit details
    Browse the repository at this point in the history

  2. Remove buy and sell (with doubles) from CLI. #544

    @abitmore
    abitmore committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    4621473 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #578 from abitmore/577-vote-id-exception 

    Capture exceptions when initializing `vote_id_type` with a string
    @abitmore
    abitmore committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    7c45b52 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #589 from ihla/fix_disable_unity_build 

    fix db_notify.cpp not included in disable unity build db set
    @oxarbitrage
    oxarbitrage committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    197ceca View commit details
    Browse the repository at this point in the history

  5. Merge pull request #595 from abitmore/544-remove-buy-sell-cmd 

    Remove buy and sell (with doubles) from CLI. #544
    @abitmore
    abitmore committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    496ab0f View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Replace pays.asset_id with current_asset. #563

    @abitmore
    abitmore committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    ad8b503 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Refactor to_string functions, add unit tests. #144

    @abitmore
    abitmore committed Jan 25, 2018
    1 Configuration menu
    Copy the full SHA
    25000ab View commit details
    Browse the repository at this point in the history

  2. Merge pull request #571 from abitmore/563-settle-fill-price 

    Add fill_price for settlement order matching, #563
    @abitmore
    abitmore committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    d4ae6ec View commit details
    Browse the repository at this point in the history

  3. Merge pull request #570 from abitmore/567-required-sigs 

    `get_required_signatures` API returns owner keys, don't return active if also requires owner, don't return signed keys.
    @abitmore
    abitmore committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    6c86cc8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #594 from abitmore/144-fix-api-uses-doubles 

    Fix market API uses doubles
    @oxarbitrage
    oxarbitrage committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    774054e View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. bump database

    @oxarbitrage
    oxarbitrage committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    6c81fdc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #602 from bitshares/oxarbitrage-patch-1 

    bump database
    @oxarbitrage
    oxarbitrage committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    1dc5939 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #603 from bitshares/develop 

    update release
    @oxarbitrage
    oxarbitrage committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    c570a73 View commit details
    Browse the repository at this point in the history