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 with develop #219

Merged
merged 24 commits into from
Sep 14, 2018
Merged

Merge with develop #219

merged 24 commits into from
Sep 14, 2018

Commits on Sep 12, 2018

  1. IRISHUB-311:finish the parameter interface definition

    @MrXJC
    MrXJC committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    4c30b28 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #207 from MrXJC/jiacheng/gov 

    IRISHUB-311: finish the parameter interface  definition
    @wukongcheng
    wukongcheng committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    73cd02f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/irisnet/irishub into jia… 

    …cheng/gov
    @MrXJC
    MrXJC committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    26cf64d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #208 from MrXJC/jiacheng/gov 

    Sync with develop
    @wukongcheng
    wukongcheng committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    f2974dd View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2018

  1. IRISHUB-317,IRISHUB-318: realize the depositProcedureParameter and it… 

    …s UnitTest
    @MrXJC
    MrXJC committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    4db5c8f View commit details
    Browse the repository at this point in the history

  2. IRISHUB-317: add the input parameter to the InitGenesis()

    @MrXJC
    MrXJC committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    c9eda4b View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. IRISHUB-317:refactor the structure of gov_params

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    9f1d11a View commit details
    Browse the repository at this point in the history

  2. IRISHUB-317:make the errors readable

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    29e37cb View commit details
    Browse the repository at this point in the history

  3. IRISHUB-317:change the package name

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    72c8e4d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #210 from MrXJC/jiacheng/gov 

    IRISHUB-317,318: realize the depositProcedureParameter and its UnitTest
    @wukongcheng
    wukongcheng committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    f462548 View commit details
    Browse the repository at this point in the history

  5. IRISHUB-398:finish the InitGenesisParameter()

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    f73843f View commit details
    Browse the repository at this point in the history

  6. IRISHUB-398:finish the InitGenesisParameter() UnitTest

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    47c2003 View commit details
    Browse the repository at this point in the history

  7. IRISHUB-398:add the genesisData to InitGenesisParameter

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    5333212 View commit details
    Browse the repository at this point in the history

  8. IRISHUB-398:add a judgement of whether the parameter address is null … 

    …or not
    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    c42bead View commit details
    Browse the repository at this point in the history

  9. Merge pull request #211 from MrXJC/jiacheng/gov 

     IRISHUB-398:finish the InitGenesisParameter() and its UnitTest
    @wukongcheng
    wukongcheng committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    d475d82 View commit details
    Browse the repository at this point in the history

  10. IRISHUB-399: finish the GovParameterMap register function

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    c7b10ff View commit details
    Browse the repository at this point in the history

  11. IRISHUB-399: finish the UnitTest of the GovParameterMap register func… 

    …tion
    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    0ee194e View commit details
    Browse the repository at this point in the history

  12. Merge pull request #212 from MrXJC/jiacheng/gov 

     IRISHUB-399: finish the GovParameterMap register function and its UnitTest
    @wukongcheng
    wukongcheng committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    f7dba86 View commit details
    Browse the repository at this point in the history

  13. IRISHUB-404:fix the cycle import

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    550d27b View commit details
    Browse the repository at this point in the history

  14. IRISHUB-404:make the code clean

    @MrXJC
    MrXJC committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    2fcb0f7 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #216 from MrXJC/jiacheng/gov 

    IRISHUB-404:fix the cycle import
    @wukongcheng
    wukongcheng committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    2bc580b View commit details
    Browse the repository at this point in the history

  16. Merge pull request #217 from irisnet/feature/gov 

    merge Feature/gov to Develop
    @wukongcheng
    wukongcheng committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    81723c1 View commit details
    Browse the repository at this point in the history

  17. IRISHUB-358: merge with irishub develop

    HaoyangLiu committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    b45f810 View commit details
    Browse the repository at this point in the history

  18. IRISHUB-358:go fmt app.go and genesis.go

    HaoyangLiu committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    a46354c View commit details
    Browse the repository at this point in the history