Skip to content
This repository has been archived by the owner on Nov 15, 2021. It is now read-only.

Support #888 #911

Merged
merged 32 commits into from
Mar 21, 2019
Merged

Support #888 #911

merged 32 commits into from
Mar 21, 2019

Commits on Oct 10, 2018

  1. Merge pull request #38 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 10, 2018
    Configuration menu
    Copy the full SHA
    13e979b View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. Merge pull request #40 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    e41e950 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    7db54f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2018

  1. Fix ExtendedJsonRpcApi (CityOfZion#662) 

    * Update ExtendedJsonRpcApi.py

- add fix provided by @localhuman so original methods are returned as well as extended methods
    @jseagrave21
    jseagrave21 committed Oct 13, 2018
    Configuration menu
    Copy the full SHA
    54a4f3f View commit details
    Browse the repository at this point in the history

  2. Mute expected test stacktrace and clearly identify why an exception i… 

    …s thrown. (CityOfZion#663)
    @ixje @jseagrave21
    ixje authored and jseagrave21 committed Oct 13, 2018
    Configuration menu
    Copy the full SHA
    0f96dc3 View commit details
    Browse the repository at this point in the history

  3. Add guideline for adding tests to the neo-privnet-unittest image (Cit… 

    …yOfZion#661)

* Add the option -u (unittest-net) to prompt.py

* Add unittest guildeline and add the smart contract source codes (UnitTest-SM.zip) to the fixtures package
    @dauTT @jseagrave21
    dauTT authored and jseagrave21 committed Oct 13, 2018
    Configuration menu
    Copy the full SHA
    1e5b4dc View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. Update CHANGELOG.rst 

    for compatibility
    @jseagrave21
    jseagrave21 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    8febcf1 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.rst

    @jseagrave21
    jseagrave21 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    c7a790f View commit details
    Browse the repository at this point in the history

  3. Merge CoZ Development into jseagrave21 Development (#49) 

    * Fix ExtendedJsonRpcApi (CityOfZion#662)

* Update ExtendedJsonRpcApi.py

- add fix provided by @localhuman so original methods are returned as well as extended methods

* Mute expected test stacktrace and clearly identify why an exception is thrown. (CityOfZion#663)

* Add guideline for adding tests to the neo-privnet-unittest image (CityOfZion#661)

* Add the option -u (unittest-net) to prompt.py

* Add unittest guildeline and add the smart contract source codes (UnitTest-SM.zip) to the fixtures package

* Add raw transaction building examples (CityOfZion#665)

* Update neo-boa version to fix core building test
    @jseagrave21
    jseagrave21 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    c51390e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #50 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    32a16e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Merge pull request #53 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 25, 2018
    Configuration menu
    Copy the full SHA
    3c8232d View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Merge pull request #54 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 Development
    @jseagrave21
    jseagrave21 authored Oct 26, 2018
    Configuration menu
    Copy the full SHA
    1b00db8 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2018

  1. Merge pull request #58 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Oct 28, 2018
    Configuration menu
    Copy the full SHA
    eb495bf View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Merge pull request #63 from CityOfZion/development 

    Merge CoZ development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Nov 1, 2018
    Configuration menu
    Copy the full SHA
    4df642e View commit details
    Browse the repository at this point in the history

  2. Update test_extended_json_rpc_api.py 

    - add tests for "showallaccounts" and "showallaccountstates"
    @jseagrave21
    jseagrave21 authored Nov 1, 2018
    Configuration menu
    Copy the full SHA
    e12e746 View commit details
    Browse the repository at this point in the history

  3. Update test_extended_json_rpc_api.py 

    - revert
    @jseagrave21
    jseagrave21 authored Nov 1, 2018
    Configuration menu
    Copy the full SHA
    0f55903 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. Merge pull request #64 from CityOfZion/development 

    Merge neo-python development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Nov 8, 2018
    Configuration menu
    Copy the full SHA
    7eb4a1e View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. Merge pull request #66 from CityOfZion/development 

    Merge neo-python development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Nov 10, 2018
    Configuration menu
    Copy the full SHA
    1f40685 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. Merge pull request #74 from CityOfZion/development 

    Merge neo-python development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Nov 20, 2018
    Configuration menu
    Copy the full SHA
    16f5163 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2018

  1. Merge pull request #81 from CityOfZion/development 

    Merge CoZ development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Dec 8, 2018
    Configuration menu
    Copy the full SHA
    ff49beb View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. Merge pull request #82 from CityOfZion/development 

    Gracefully handle NEP-5 balance query failures (CityOfZion#744)
    @jseagrave21
    jseagrave21 authored Dec 11, 2018
    Configuration menu
    Copy the full SHA
    05ce2e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. Merge pull request #92 from CityOfZion/development 

    Merge CoZ development into neo-python development
    @jseagrave21
    jseagrave21 authored Jan 10, 2019
    Configuration menu
    Copy the full SHA
    19dce4f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. Merge pull request #95 from CityOfZion/development 

    Merge CoZ development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Jan 11, 2019
    Configuration menu
    Copy the full SHA
    08cd57f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2019

  1. Merge pull request #97 from CityOfZion/development 

    Merge CoZ Development into jseagrave21 development
    @jseagrave21
    jseagrave21 authored Jan 19, 2019
    Configuration menu
    Copy the full SHA
    e085410 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Merge pull request #102 from CityOfZion/development 

    Merge CoZ/neo-python development into jseagrave21/neo-python development
    @jseagrave21
    jseagrave21 authored Feb 17, 2019
    Configuration menu
    Copy the full SHA
    84c8478 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. Merge branch 'development' of https://github.com/CityOfZion/neo-python … 

    …into HEAD
    jseagrave21 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    cb920ce View commit details
    Browse the repository at this point in the history

  2. implement changes in neocore

    jseagrave21 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    557af22 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Merge branch 'development' of https://github.com/CityOfZion/neo-python … 

    …into support-CityOfZion#888
    jseagrave21 committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    daf251a View commit details
    Browse the repository at this point in the history

  2. update CHANGELOG.rst

    jseagrave21 committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    6088b30 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2019

  1. implement feedback from CityOfZion#911 (review)

    jseagrave21 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    4ad60f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. Merge branch 'development' of https://github.com/CityOfZion/neo-python … 

    …into support-CityOfZion#888
    jseagrave21 committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    4225e36 View commit details
    Browse the repository at this point in the history

  2. edit travis.yml for testing

    jseagrave21 committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    d1261a1 View commit details
    Browse the repository at this point in the history