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

Excel3 #796

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

Excel3 #796

wants to merge 59 commits into from

Commits on Jul 31, 2017

  1. add html

    @wangxp2016
    wangxp2016 committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    64db4b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Mod:translate; .gitignore

    @caozhongzheng
    caozhongzheng committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    2ca5b46 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from peersafe/change_translate 

    Mod:translate; .gitignore
    @wangxp2016
    wangxp2016 committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    446754c View commit details
    Browse the repository at this point in the history

  3. ui page edit

    @wangxp2016
    wangxp2016 committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    ffc1e40 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from peersafe/ui-page-edit 

    ui page edit
    @caozhongzheng
    caozhongzheng committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    25bea7d View commit details
    Browse the repository at this point in the history

  5. edit home page

    @wangxp2016
    wangxp2016 committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    b4a7dc2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from peersafe/ui-home-page 

    edit home page
    @caozhongzheng
    caozhongzheng committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    cb68b2f View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. html edit

    @wangxp2016
    wangxp2016 committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    5d2099f View commit details
    Browse the repository at this point in the history

  2. edit home page

    @wangxp2016
    wangxp2016 committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    6d4962c View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Merge pull request #8 from peersafe/html-edit 

    Html edit
    @caozhongzheng
    caozhongzheng committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    4f8e526 View commit details
    Browse the repository at this point in the history

  2. login html

    @wangxp2016
    wangxp2016 committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    ff2e976 View commit details
    Browse the repository at this point in the history

  3. edit login

    @wangxp2016
    wangxp2016 committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    f0fb724 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. edit login page

    @wangxp2016
    wangxp2016 committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    8e42021 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from peersafe/login-page 

    Login page
    @caozhongzheng
    caozhongzheng committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    145d4fb View commit details
    Browse the repository at this point in the history

  3. Add blacklist

    @caozhongzheng
    caozhongzheng committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    5397918 View commit details
    Browse the repository at this point in the history

  4. change service

    @caozhongzheng
    caozhongzheng committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    4eb12d0 View commit details
    Browse the repository at this point in the history

  5. Mod:Service

    @caozhongzheng
    caozhongzheng committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    f961a34 View commit details
    Browse the repository at this point in the history

  6. Mod:黑名单页面的增删改查

    @caozhongzheng
    caozhongzheng committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    e1e91b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. Merge pull request #10 from peersafe/cd 

    Cd
    @wangxp2016
    wangxp2016 committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    66ff123 View commit details
    Browse the repository at this point in the history

  2. edit html

    @wangxp2016
    wangxp2016 committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    9f64553 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. Add: login page logic

    @caozhongzheng
    caozhongzheng committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    935a425 View commit details
    Browse the repository at this point in the history

  2. css edit

    @wangxp2016
    wangxp2016 committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    3695e5c View commit details
    Browse the repository at this point in the history

  3. jquery

    @wangxp2016
    wangxp2016 committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    3591b28 View commit details
    Browse the repository at this point in the history

  4. main.min.js

    @wangxp2016
    wangxp2016 committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    c8ec22f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from peersafe/leveldb 

    Add: login page logic
    @wangxp2016
    wangxp2016 committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    f1bcbd3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13 from peersafe/ui-edit-page 

    Ui edit page
    @caozhongzheng
    caozhongzheng committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    b831fde View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. edit TXBydate

    @wangxp2016
    wangxp2016 committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    d0c7d44 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. edit H5 and blockByDate

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    2afc9b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from peersafe/address-page 

    Address page
    @efdssdf
    efdssdf committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    52b1067 View commit details
    Browse the repository at this point in the history

  3. 添加excel导出模块

    @efdssdf
    efdssdf committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    de8117e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into excel

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    e1dc76b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #15 from peersafe/excel 

    添加excel导出模块
    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    f766899 View commit details
    Browse the repository at this point in the history

  6. Mod:登录和黑名单用bitcore-service支持实现

    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    362b81f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #16 from peersafe/use-bitcore-service 

    Mod:登录和黑名单用bitcore-service支持实现
    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    7993832 View commit details
    Browse the repository at this point in the history

  8. main.min.js and main.min.css

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    a1dc000 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of https://github.com/peersafe/insight-ui into… 

    … develop
    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    abb3b87 View commit details
    Browse the repository at this point in the history

  10. delete ripplecharts

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    f1f99fb View commit details
    Browse the repository at this point in the history

  11. add ripplecharts

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    7d63078 View commit details
    Browse the repository at this point in the history

  12. edit ripplecharts

    @wangxp2016
    wangxp2016 committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    e7987f6 View commit details
    Browse the repository at this point in the history

  13. Add: history txs of blacklist

    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    921f991 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #18 from peersafe/feature/history2 

    Add: history txs of blacklist
    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    4a3bd2c View commit details
    Browse the repository at this point in the history

  15. Mod:历史界面数据展示

    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    6e1b917 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #19 from peersafe/feature/history3 

    Mod:历史界面数据展示
    @caozhongzheng
    caozhongzheng committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    0acc7c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2017

  1. Add:黑名单用需求要求的UI方式实现

    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    db7e282 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from peersafe/feature/blacklist-ui 

    Add:黑名单用需求要求的UI方式实现
    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    ad179c4 View commit details
    Browse the repository at this point in the history

  3. Mod:增加title行

    @efdssdf
    efdssdf committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    610bc22 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #21 from peersafe/excel2 

    Mod:增加title行
    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    b939466 View commit details
    Browse the repository at this point in the history

  5. edit ui

    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    232bc86 View commit details
    Browse the repository at this point in the history

  6. Add:黑名单的删除实现

    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    bd9fad8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #22 from peersafe/feature/blacklist-ui2 

    Add:黑名单的删除实现
    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    a1c2138 View commit details
    Browse the repository at this point in the history

  8. edit all ui

    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    0ce157e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into uiedit-page

    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    4015873 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #23 from peersafe/uiedit-page 

    Uiedit page
    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    b75fb17 View commit details
    Browse the repository at this point in the history

  11. Fix:开始时无法关闭添加黑名单的问题

    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    9bb0412 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #24 from peersafe/bug/cancel-add-blacklist 

    Fix:开始时无法关闭添加黑名单的问题
    @caozhongzheng
    caozhongzheng committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    4648c33 View commit details
    Browse the repository at this point in the history

  13. history show and hide

    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    59abef4 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #25 from peersafe/historyshow 

    history show and hide
    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    c647666 View commit details
    Browse the repository at this point in the history

  15. Mod:修改导出

    @efdssdf
    efdssdf committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    f093a51 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'develop' into excel3

    @wangxp2016
    wangxp2016 committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    aecc2e4 View commit details
    Browse the repository at this point in the history