Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Preview4 #698

Merged
merged 6 commits into from
Dec 18, 2020
Merged

Preview4 #698

merged 6 commits into from
Dec 18, 2020

Commits on Dec 15, 2020

  1. Final merge for Preview4 (#693) 

    * Sync to management SC (#689)

* Sync to neo-project/neo#2119

* Update nuget

Co-authored-by: Shargon <shargon@gmail.com>

* Update to Neo v3.0.0-CI01105 (#692)

* Update to Neo v3.0.0-CI01015

* Update neo-cli.csproj

Co-authored-by: Shargon <shargon@gmail.com>
    @superboyiii @shargon
    superboyiii and shargon authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    9d154fc View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Merge from master (#697) 

    * Sync to management SC (#689)

* Sync to neo-project/neo#2119

* Update nuget

Co-authored-by: Shargon <shargon@gmail.com>

* Update to Neo v3.0.0-CI01105 (#692)

* Update to Neo v3.0.0-CI01015

* Update neo-cli.csproj

* Update name nep17 (#695)

* Fix Parse manifestFilePath

* merge master

* Update Name for NEP17

* fix format

* show error message

* fix

* fix

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: cloud8little <34291844+cloud8little@users.noreply.github.com>
    @superboyiii @shargon @cloud8little
    3 people authored Dec 18, 2020
    Configuration menu
    Copy the full SHA
    726a306 View commit details
    Browse the repository at this point in the history

  2. Preview4

    @superboyiii
    superboyiii committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    52a61c2 View commit details
    Browse the repository at this point in the history

  3. sync gui

    @superboyiii
    superboyiii committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    8277592 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Preview4

    @superboyiii
    superboyiii authored Dec 18, 2020
    Configuration menu
    Copy the full SHA
    b451d78 View commit details
    Browse the repository at this point in the history

  5. update changelog for preview 4 (#699)

    @Qiao-Jin
    Qiao-Jin authored Dec 18, 2020
    Configuration menu
    Copy the full SHA
    5b6e6e5 View commit details
    Browse the repository at this point in the history