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

Master #127

Open
wants to merge 359 commits into
base: pr/13
Choose a base branch
from
Open

Master #127

wants to merge 359 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jan 9, 2016

  1. Merge pull request #54 from kelaodo/patch-1 

    Homework_week1
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    b7f720c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #55 from circlechai/patch-2 

    SkipTickets by 柴源
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    41075b5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56 from circlechai/master 

    Create chaiyuan.py
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    f3aae2a View commit details
    Browse the repository at this point in the history

  4. yangruiyou 

    58同城第一次大作业
    @yangruiyou85
    yangruiyou85 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    fd30e93 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #57 from yangruiyou85/patch-4 

    yangruiyou
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    ee5cbf7 View commit details
    Browse the repository at this point in the history

  6. 作业 

    作业
    @zhouj1nx1n
    zhouj1nx1n committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    7f6a04d View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'mugglecoding/master' into zhangruochen

    zhangruochen authored and zhangruochen committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    34ddb95 View commit details
    Browse the repository at this point in the history

  8. week1-zhangruochen 

    第一周大作业
    zhangruochen authored and zhangruochen committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    93a82d7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #59 from zhangruochen/zhangruochen 

    Zhangruochen
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    d3e25be View commit details
    Browse the repository at this point in the history

  10. Merge pull request #58 from zhouj1nx1n/patch-1 

    作业
    @mugglecoding
    mugglecoding committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    a749bd8 View commit details
    Browse the repository at this point in the history

  11. 大作业提交 

    liyan
    liyan0321 authored and liyan0321 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    5a32399 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'mugglecoding/master' into liyan0321

    liyan0321 authored and liyan0321 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    83e8987 View commit details
    Browse the repository at this point in the history

  13. week homework

    @QuantVela
    QuantVela committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    6549110 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'mugglecoding/master' into huangxiaoming

    @smallming36
    smallming36 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    185b738 View commit details
    Browse the repository at this point in the history

  15. 提交大作业

    @Kylinlin
    Kylinlin committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    3cf3353 View commit details
    Browse the repository at this point in the history

  16. 第三次大作业 

    RT
    @huyongsheng
    huyongsheng committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    8867822 View commit details
    Browse the repository at this point in the history

  17. liyan

    liyan0321 authored and liyan0321 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    4cbc51d View commit details
    Browse the repository at this point in the history

  18. Merge branch 'mugglecoding/master' into liyan0321

    liyan0321 authored and liyan0321 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    dd20d70 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. Delete liyan00.py

    @liyan0321
    liyan0321 committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    f6d5270 View commit details
    Browse the repository at this point in the history

  2. Delete liyan000.py

    @liyan0321
    liyan0321 committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    676d4d2 View commit details
    Browse the repository at this point in the history

  3. 合并分支

    @leiyue
    leiyue committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    4a9baf6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	花名册
    @leiyue
    leiyue committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    18b9036 View commit details
    Browse the repository at this point in the history

  5. 合并分支

    @leiyue
    leiyue committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    10a1f43 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:mugglecoding/Plan-for-combating 

    # Conflicts:
#	花名册
    @leiyue
    leiyue committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    f37904e View commit details
    Browse the repository at this point in the history

  7. Create zhangguifeng

    @zhangguifeng
    zhangguifeng committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    cd26592 View commit details
    Browse the repository at this point in the history

  8. 大作业提交 

    大作业提交
    @zhangguifeng
    zhangguifeng committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    7204dc0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #66 from zhangguifeng/zhangguifeng 

    zhangguifeng
    @mugglecoding
    mugglecoding committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    822c876 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. week2 

    week2
    @QuantVela
    QuantVela committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    c0a0088 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. 2.1 homework 

    submit 2.1 homework
    @miaozaiye
    miaozaiye committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    a2c46d6 View commit details
    Browse the repository at this point in the history

  2. Add Week02 File

    ZiShanLiang committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    f3b9463 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'mugglecoding/master' into liangzishan 

    # Conflicts:
#	花名册
    ZiShanLiang committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    028ffdb View commit details
    Browse the repository at this point in the history

  4. Change some file

    ZiShanLiang committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    49b25e2 View commit details
    Browse the repository at this point in the history

  5. week2 

    week2
    @QuantVela
    QuantVela committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    ce1c0b9 View commit details
    Browse the repository at this point in the history

  6. week2up 

    week2up
    @QuantVela
    QuantVela committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    5a56393 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2016

  1. 1.2answerupdate 

    1.2answerupdate
    @QuantVela
    QuantVela committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    2d47735 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33 from gongminghui/gongminghui 

    Gongminghui
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    9b4c38a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from lzsdodo/liangzishan 

    Week01 Homework by Zachary
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    9f03820 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/mugglecoding/master'

    @zhukai2015
    zhukai2015 committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    0ca6ef5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/zhukai'

    @zhukai2015
    zhukai2015 committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    ea9e128 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:mugglecoding/Plan-for-combating

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    7b7d671 View commit details
    Browse the repository at this point in the history

  7. 2.1作业提交

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    815fbc6 View commit details
    Browse the repository at this point in the history

  8. a 

    a
    @QuantVela
    QuantVela committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    f58b978 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #62 from Kylinlin/linguanhao 

    提交大作业
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    2d08fa2 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #67 from miaozaiye/Miaozaiye 

    2.1 homework
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    c51679c View commit details
    Browse the repository at this point in the history

  11. Merge pull request #65 from zhangguifeng/patch-2 

    Create zhangguifeng
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    f974b02 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #64 from liyan0321/liyan0321 

    Liyan0321
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    b74b016 View commit details
    Browse the repository at this point in the history

  13. leiyue 

    leiyue
    @QuantVela
    QuantVela committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    27c1c80 View commit details
    Browse the repository at this point in the history

  14. 2.1someone

    @QuantVela
    QuantVela committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    f7b852b View commit details
    Browse the repository at this point in the history

  15. Add 

    存在一个问题,在从mongoDB中读取数据的时候,会报MongoClient opened before
fork.的warning.设置了maxPoolSize之后之后不会再报,但是速度受到了很大的限制,差不多两秒才能抓取一个商品的数据.
由于还在期末考,时间很紧,今天考了倒数第二门之后用了一个晚上把作业写完,这周已经没有时间来完善这个爬虫了,所以只能先交上去这个半成品.
由于测试的原因我把页数爬取设置到了5,修改之后应该可以爬取所有数据
    @xjlin
    xjlin committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    919b435 View commit details
    Browse the repository at this point in the history

  16. 2.2作业提交 

    2.3作业提交
第二周大作业提交
    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    8e272c6 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of github.com:mugglecoding/Plan-for-combating

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    d0114ae View commit details
    Browse the repository at this point in the history

  18. 和 upstream 仓库保持队形

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    380ab8c View commit details
    Browse the repository at this point in the history

  19. 移动 2.2 作业的 README.md 方便大家了解

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    428390c View commit details
    Browse the repository at this point in the history

  20. 修改 README.md 排版，讨厌的 GFM

    @leiyue
    leiyue committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    0114367 View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'refs/remotes/mugglecoding/master'

    @zhukai2015
    zhukai2015 committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    3f700f9 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #68 from xjlin/linxingjian 

    Linxingjian
    @mugglecoding
    mugglecoding committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    d36aec2 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. 2.1-zhaocong

    @wormzc
    wormzc committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    7acee99 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #70 from wormzc/zhaocong 

    Zhaocong
    @mugglecoding
    mugglecoding committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    3c0e738 View commit details
    Browse the repository at this point in the history

  3. 修改1.3练习题crawl_list未使用的bug

    @zhenchaozhu
    zhenchaozhu committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    c5151d9 View commit details
    Browse the repository at this point in the history

  4. zhaocong 

    2.2
    @wormzc
    wormzc committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    8d54763 View commit details
    Browse the repository at this point in the history

  5. week1大作业 

    week1大作业
    @Woowoody
    Woowoody committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    b86dd00 View commit details
    Browse the repository at this point in the history

  6. 1.3wudi 

    1.3练习
    @Woowoody
    Woowoody committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    14a4655 View commit details
    Browse the repository at this point in the history

  7. Create zhangruochenweek2

    @zhangruochen
    zhangruochen committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    59dc74c View commit details
    Browse the repository at this point in the history

  8. week2-zhangruochen 

    week2大作业
急事出门，先交掉，回国再修改优化
    zhangruochen authored and zhangruochen committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    76af661 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'refs/remotes/mugglecoding/master'

    @zhukai2015
    zhukai2015 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    0732a73 View commit details
    Browse the repository at this point in the history

  10. 加入商户入口

    @leiyue
    leiyue committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    2aaf252 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of github.com:mugglecoding/Plan-for-combating

    @leiyue
    leiyue committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    da0a235 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhangxiaoxi
    zhangxiaoxi083 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    c154833 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master' into zhangx… 

    …iaoxi
    zhangxiaoxi083 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    52b39a7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhangxiaoxi
    zhangxiaoxi083 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    2b61c74 View commit details
    Browse the repository at this point in the history

  4. week2-zhangxiaoxi 

    2交作业
    zhangxiaoxi083 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    b96112a View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'mugglecoding/master' into wangming

    @Mingwang1986
    Mingwang1986 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    1af6524 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhaocong
    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    ea7c1fd View commit details
    Browse the repository at this point in the history

  7. zhaocong 

    第二周大作业
    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    e289a45 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhaocong
    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    f67cb55 View commit details
    Browse the repository at this point in the history

  9. 1

    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    19f7a66 View commit details
    Browse the repository at this point in the history

  10. Revert "1" 

    This reverts commit 19f7a66.
    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    1fa1610 View commit details
    Browse the repository at this point in the history

  11. 2

    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    a922b77 View commit details
    Browse the repository at this point in the history

  12. Revert "2" 

    This reverts commit a922b77.
    @wormzc
    wormzc committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    3d9df8a View commit details
    Browse the repository at this point in the history

  13. 第二周大作业提交 

    客户端提交不了 所以我就把四个文件都粘到这里了
    @yinwanmei
    yinwanmei committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    3a37009 View commit details
    Browse the repository at this point in the history

  14. git pull from orgin

    @xczswt1993
    xczswt1993 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    f2c7f52 View commit details
    Browse the repository at this point in the history

  15. commit from shiwentao

    @xczswt1993
    xczswt1993 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    0fc90c0 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #73 from yinwanmei/patch-1 

    第二周大作业提交
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    ea3d430 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #72 from zhangruochen/patch-1 

    zhangruochen-week2
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    dc63ae4 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #71 from wormzc/zhaocong 

    Zhaocong
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    2b489ac View commit details
    Browse the repository at this point in the history

  19. yaobozhangweek2 

    第二周大作业
    @yaobozhang
    yaobozhang committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    f696816 View commit details
    Browse the repository at this point in the history

  20. modify function get_info

    @xczswt1993
    xczswt1993 committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    47afec0 View commit details
    Browse the repository at this point in the history

  21. 作业

    @j-how
    j-how committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    e5e1cde View commit details
    Browse the repository at this point in the history

  22. Merge branch 'mugglecoding/master' into yangguang 

    # Conflicts:
#	.gitignore
#	花名册
    @UXplayer
    UXplayer committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    b8bc41c View commit details
    Browse the repository at this point in the history

  23. Merge pull request #78 from j-how/master 

    作业week2
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    ad397da View commit details
    Browse the repository at this point in the history

  24. Merge pull request #77 from zhangxiaoxi083/zhangxiaoxi 

    Zhangxiaoxi
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    e6cdc2e View commit details
    Browse the repository at this point in the history

  25. Merge pull request #76 from yaobozhang/yaobozhang 

    yaobozhangweek2
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    4b1b505 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #74 from xczswt1993/master 

    第二周大作业
    @mugglecoding
    mugglecoding committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    6a5070b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2016

  1. 提交

    @Kylinlin
    Kylinlin committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    e417a12 View commit details
    Browse the repository at this point in the history

  2. 提交大作业

    @Kylinlin
    Kylinlin committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    9fee41a View commit details
    Browse the repository at this point in the history

  3. 2.1 

    2.1 homework
    @you-shu
    you-shu committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    1449a33 View commit details
    Browse the repository at this point in the history

  4. gaoxiangdong_week02

    @iamgxd01
    iamgxd01 committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    020058d View commit details
    Browse the repository at this point in the history

  5. Revert "maizhenchao" 

    This reverts commit 00d98ba.
    @MaiZhenchao
    MaiZhenchao committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    b07b35f View commit details
    Browse the repository at this point in the history

  6. 第二周作业 

    交作业
    @MaiZhenchao
    MaiZhenchao committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    5bec40a View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'mugglecoding/master' into liangzishan

    ZiShanLiang committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    956aec9 View commit details
    Browse the repository at this point in the history

  8. Week2 Change

    ZiShanLiang committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    7abc908 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #85 from lzsdodo/liangzishan 

    Week2 Liangzishan
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    ebaccfa View commit details
    Browse the repository at this point in the history

  10. Merge pull request #84 from MaiZhenchao/MaiZhenchao 

    Maizhenchao
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    854fae6 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #82 from gongminghui/patch-3 

    2.1
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    7a6b0ce View commit details
    Browse the repository at this point in the history

  12. Merge pull request #81 from Kylinlin/linguanhao 

    Linguanhao
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    3e77b56 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #80 from huyongsheng/master 

    gengxin
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    505a744 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #79 from huyongsheng/huyongsheng 

    Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    c9462dd View commit details
    Browse the repository at this point in the history

  15. Merge pull request #83 from iamgxd01/master 

    gaoxiangdong_week02
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    6ba9b9b View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …MaiZhenchao
    @MaiZhenchao
    MaiZhenchao committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    59a2739 View commit details
    Browse the repository at this point in the history

  17. Create Du_Boxing_exercise_2 

    第二周作业，网速太差无法上传，四个文件写在一起。
    @Prof-L
    Prof-L committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    29f3d38 View commit details
    Browse the repository at this point in the history

  18. 2.1作业提交

    @MaiZhenchao
    MaiZhenchao committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    ec4dc93 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'mugglecoding/master' into huangxiaoming

    @smallming36
    smallming36 committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    29ef6b8 View commit details
    Browse the repository at this point in the history

  20. huangxiaoming 

    week2大作业
    @smallming36
    smallming36 committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    f32f939 View commit details
    Browse the repository at this point in the history

  21. week2

    @UXplayer
    UXplayer committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    fdd5c1a View commit details
    Browse the repository at this point in the history

  22. Merge pull request #88 from smallming36/huangxiaoming 

    Huangxiaoming
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    055913f View commit details
    Browse the repository at this point in the history

  23. Merge pull request #87 from MaiZhenchao/MaiZhenchao 

    Maizhenchao
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    d5e291a View commit details
    Browse the repository at this point in the history

  24. Merge pull request #86 from Arthurdu/patch-1 

    Create Du_Boxing_exercise_2
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    4295ccf View commit details
    Browse the repository at this point in the history

  25. delete fucking huamingce 

    delete fucking huamingce
    @QuantVela
    QuantVela committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    6361413 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #89 from UXplayer/yangguang 

    Yangguang
    @mugglecoding
    mugglecoding committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    b6d4015 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #1 from mugglecoding/master 

    121312313213
    @zhangzhexu
    zhangzhexu committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    6eb25ab View commit details
    Browse the repository at this point in the history

  28. 1231 

    11123
    @zhangzhexu
    zhangzhexu committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    a951aca View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2016

  1. week2done

    @QuantVela
    QuantVela committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    9795671 View commit details
    Browse the repository at this point in the history

  2. alittlechange

    @QuantVela
    QuantVela committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    8969252 View commit details
    Browse the repository at this point in the history

  3. charts 

    charts
    @QuantVela
    QuantVela committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    da1eda5 View commit details
    Browse the repository at this point in the history

  4. removeweek1homework

    @QuantVela
    QuantVela committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    97992f6 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/mugglecoding/master'

    @zhukai2015
    zhukai2015 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    7c90eb5 View commit details
    Browse the repository at this point in the history

  6. week2datacomeback

    @QuantVela
    QuantVela committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    4cb94ae View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'refs/remotes/mugglecoding/master'

    @zhukai2015
    zhukai2015 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    3850dd1 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'mugglecoding/master' into sushun

    sushun1991 authored and sushun1991 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    e21542a View commit details
    Browse the repository at this point in the history

  9. sushun 

    week2大作业
    sushun1991 authored and sushun1991 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    bc2e492 View commit details
    Browse the repository at this point in the history

  10. yaobozhang 

    第二周大作业
    @yaobozhang
    yaobozhang committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    c8d8617 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'mugglecoding/master'

    @Mingwang1986
    Mingwang1986 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    9666254 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'wangming'

    @Mingwang1986
    Mingwang1986 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    50d201a View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'mugglecoding/master'

    @Mingwang1986
    Mingwang1986 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    eca0660 View commit details
    Browse the repository at this point in the history

  14. homework-week2 

    homework-week2
    @Mingwang1986
    Mingwang1986 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    2d5f71c View commit details
    Browse the repository at this point in the history

  15. Merge pull request #92 from Mingwang1986/master 

    wangming
    @mugglecoding
    mugglecoding committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    c7e68d6 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #91 from yaobozhang/yaobozhang 

    Yaobozhang
    @mugglecoding
    mugglecoding committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    3a4185a View commit details
    Browse the repository at this point in the history

  17. Merge pull request #90 from sushun1991/sushun 

    Sushun
    @mugglecoding
    mugglecoding committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    e6c8ec6 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2016

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into zhaocong

    @wormzc
    wormzc committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    c83d259 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhaocong
    @wormzc
    wormzc committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    6728bed View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2016

  1. 大作业2

    @zhukai2015
    zhukai2015 committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    f8de552 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. 3.2&3.3update 

    3.2&3.3update
    @QuantVela
    QuantVela committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    7b405f1 View commit details
    Browse the repository at this point in the history

  2. 3.2&3.3vdcode 

    3.2&3.3vd
    @QuantVela
    QuantVela committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    fd9f3c6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from mugglecoding/master 

    e
    @zhangzhexu
    zhangzhexu committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    d876155 View commit details
    Browse the repository at this point in the history

  4. week-guozifeng 

    迟到的作业
    @gzifeng
    gzifeng committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    491b4e0 View commit details
    Browse the repository at this point in the history

  5. week3homework

    @QuantVela
    QuantVela committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    54bcd76 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. 3.4code

    @QuantVela
    QuantVela committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    a00b664 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'mugglecoding/master' into Miaozaiye

    @miaozaiye
    miaozaiye committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    137dbec View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2016

  1. week3gogogo 

    sample data and the answer
    @QuantVela
    QuantVela committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    f17e110 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …zhaocong
    @wormzc
    wormzc committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    2cfdd46 View commit details
    Browse the repository at this point in the history

  3. 第二周大作业-wudi 

    交作业
    @Woowoody
    Woowoody committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    c068be6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …wudi
    @Woowoody
    Woowoody committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    38054c9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #97 from Woowoody/wudi 

    Wudi
    @mugglecoding
    mugglecoding committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    13b86ca View commit details
    Browse the repository at this point in the history

  6. Merge pull request #96 from DarkRepulsor/guozifeng 

    week-guozifeng
    @mugglecoding
    mugglecoding committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    a82ac29 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #95 from zhangzhexu/master 

    12
    @mugglecoding
    mugglecoding committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    cbffdf0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #94 from zhukai2015/master 

    Master
    @mugglecoding
    mugglecoding committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    dce0cf8 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #93 from wormzc/zhaocong 

    Zhaocong
    @mugglecoding
    mugglecoding committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    782bdbb View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'mugglecoding/master' into Miaozaiye

    @miaozaiye
    miaozaiye committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    01e5d7e View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Merge pull request #98 from huyongsheng/master 

    第三次大作业
    @mugglecoding
    mugglecoding committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    67721e3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …MaiZhenchao
    @MaiZhenchao
    MaiZhenchao committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    56e10da View commit details
    Browse the repository at this point in the history

  3. 第三周作业0125

    @iamgxd01
    iamgxd01 committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    fff522d View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. miaozaiye w2 homework 

    subscribe w2 homework
    @miaozaiye
    miaozaiye committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    518d7b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #99 from iamgxd01/master 

    第三周作业0125
    @mugglecoding
    mugglecoding committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    da67802 View commit details
    Browse the repository at this point in the history

  3. nope 

    nope
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    6e440a0 View commit details
    Browse the repository at this point in the history

  4. 1 

    1
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    602bfef View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from Lasergrand/Lasergrand 

    nope
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    d8c7059 View commit details
    Browse the repository at this point in the history

  6. 1 

    1
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    b71d701 View commit details
    Browse the repository at this point in the history

  7. Revert "nope"

    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    96bd65b View commit details
    Browse the repository at this point in the history

  8. 1 

    1
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    d7db112 View commit details
    Browse the repository at this point in the history

  9. 123 

    123
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    6e8f8ba View commit details
    Browse the repository at this point in the history

  10. 1 

    1
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    c012984 View commit details
    Browse the repository at this point in the history

  11. 0.1 

    0.1
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    e4555f9 View commit details
    Browse the repository at this point in the history

  12. 0.2 

    0.2
    @Lasergrand
    Lasergrand committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    893896c View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …MaiZhenchao
    @MaiZhenchao
    MaiZhenchao committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    91b36d0 View commit details
    Browse the repository at this point in the history

  14. 这次作业比较艰辛，好不容易弄好了！

    @xczswt1993
    xczswt1993 committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    3c777ba View commit details
    Browse the repository at this point in the history

  15. 3.2 homework

    @leiyue
    leiyue committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    d15ea4f View commit details
    Browse the repository at this point in the history

  16. ignore ipynb_checkpoints

    @leiyue
    leiyue committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    3978512 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Merge pull request #102 from xczswt1993/master 

    这次作业比较艰辛，好不容易弄好了！
    @mugglecoding
    mugglecoding committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    9a8b6eb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #101 from Lasergrand/Lasergrand 

    Lasergrand
    @mugglecoding
    mugglecoding committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    bc71755 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #100 from Lasergrand/revert-1-Lasergrand 

    Revert 1 lasergrand
    @mugglecoding
    mugglecoding committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    de7579a View commit details
    Browse the repository at this point in the history

  4. 3.3 homework

    @leiyue
    leiyue committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    f84abea View commit details
    Browse the repository at this point in the history

  5. 3.3 item_info.count

    @leiyue
    leiyue committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    b97413f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:mugglecoding/Plan-for-combating

    @leiyue
    leiyue committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    9caa250 View commit details
    Browse the repository at this point in the history

  7. 大作业

    @leiyue
    leiyue committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    ebe1843 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …MaiZhenchao
    @MaiZhenchao
    MaiZhenchao committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    e08af67 View commit details
    Browse the repository at this point in the history

  9. 大作业提交

    @MaiZhenchao
    MaiZhenchao committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    3b2146a View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. wudi 

    3.3练习题作业
    @Woowoody
    Woowoody committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    64cb0d0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into … 

    …wudi
    @Woowoody
    Woowoody committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    f882304 View commit details
    Browse the repository at this point in the history

  3. 3.3-wudi 

    3.3交作业
    @Woowoody
    Woowoody committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    79eafe2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #104 from Woowoody/wudi 

    Wudi
    @mugglecoding
    mugglecoding committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    f47d6a6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #103 from MaiZhenchao/MaiZhenchao 

    Maizhenchao
    @mugglecoding
    mugglecoding committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    076ebf7 View commit details
    Browse the repository at this point in the history

  6. create chaiyuan.py 

    应该就在最近，58的代码改了,造成了两个问题：
1. 商品链接不再是明文，而是用了跳转的形式
2. 个人板块中新增了一个叫zhuanzhuan的网站商品内容，详情页和58本身的完全不同。
经观察，寻得解决方案如下：
1. a标签的上一级tr标签中，有一个名为logr的属性，其中包含了商品的id，获得id后便可以合成商品链接。
2. zhuanzhuan商品的tr标签中，不存在logr属性。可以利用if进行筛选。
    @circlechai
    circlechai committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    f90fbf0 View commit details
    Browse the repository at this point in the history

  7. homework3_youshu 

    homework3
    @you-shu
    you-shu committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    c79b78f View commit details
    Browse the repository at this point in the history

  8. 3.3 homework 

    3.3 homework
    @miaozaiye
    miaozaiye committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    b7539e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Merge pull request #107 from miaozaiye/Miaozaiye 

    Miaozaiye
    @mugglecoding
    mugglecoding committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    96bc3d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #106 from gongminghui/patch-4 

    homework3_youshu
    @mugglecoding
    mugglecoding committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    feb3319 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #105 from circlechai/patch-1 

    create chaiyuan.py
    @mugglecoding
    mugglecoding committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    23c7956 View commit details
    Browse the repository at this point in the history

  4. week4go 

    week4go
    @QuantVela
    QuantVela committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    8d8ee59 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2016

  1. 4.1fix

    @QuantVela
    QuantVela committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    e8bfb2d View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2016

  1. 4.2go! 

    anybody here?
    @QuantVela
    QuantVela committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    7108dd2 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. 4.3

    @QuantVela
    QuantVela committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    5e2f647 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. done

    @QuantVela
    QuantVela committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    7539cc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2016

  1. 1.3change

    @QuantVela
    QuantVela committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    94075fc View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. update 

    english path
    @QuantVela
    QuantVela committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    cf4c502 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2016

  1. 1.3update 

    1.3update
    @QuantVela
    QuantVela committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    7023ef5 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2016

  1. sample_data update 

    视频里用的就是这个样本数据
    @QuantVela
    QuantVela committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    bc82b2a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. No commit message

    @shenghe
    shenghe committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    a21a48e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2016

  1. 4.2arti_info 

    4.2arti_info
    @QuantVela
    QuantVela committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    18ea73a View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. 浏览量的抓取做了反爬虫，因此加上header信息，不然返回为空

    @kprot
    kprot committed May 9, 2016
    Configuration menu
    Copy the full SHA
    34f8273 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2016

  1. Merge pull request #128 from AJKipper/master 

    浏览量的抓取做了反爬虫，因此加上header信息，不然返回为空
    @mugglecoding
    mugglecoding committed May 10, 2016
    Configuration menu
    Copy the full SHA
    918b6f0 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2016

  1. update

    @shenghe
    shenghe committed May 11, 2016
    Configuration menu
    Copy the full SHA
    5c43f3a View commit details
    Browse the repository at this point in the history

  2. 添加自动提取详情

    @shenghe
    shenghe committed May 11, 2016
    Configuration menu
    Copy the full SHA
    169bcf4 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2016

  1. Update homework1VID.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    c2ded58 View commit details
    Browse the repository at this point in the history

  2. Update homework1VID.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    946601e View commit details
    Browse the repository at this point in the history

  3. Update main.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    e20653a View commit details
    Browse the repository at this point in the history

  4. Update page_parsing.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    02b76df View commit details
    Browse the repository at this point in the history

  5. Update counts.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    cfe2b8e View commit details
    Browse the repository at this point in the history

  6. Update channel_extracing.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    a74daad View commit details
    Browse the repository at this point in the history

  7. Update main.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    2afeaf3 View commit details
    Browse the repository at this point in the history

  8. Update readme.md

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    91f7a4f View commit details
    Browse the repository at this point in the history

  9. Update settings.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    c2c51e8 View commit details
    Browse the repository at this point in the history

  10. Delete db.sqlite3

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    a409f7d View commit details
    Browse the repository at this point in the history

  11. Update urls.py

    @shenghe
    shenghe committed May 12, 2016
    Configuration menu
    Copy the full SHA
    3886823 View commit details
    Browse the repository at this point in the history

  12. 增加问题解答整理链接

    @kprot
    kprot committed May 12, 2016
    Configuration menu
    Copy the full SHA
    165cf0a View commit details
    Browse the repository at this point in the history

  13. Merge pull request #129 from AJKipper/master 

    增加问题解答整理链接
    @kprot
    kprot committed May 12, 2016
    Configuration menu
    Copy the full SHA
    23695c8 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2016

  1. No commit message

    @shenghe
    shenghe committed May 15, 2016
    Configuration menu
    Copy the full SHA
    58d22f9 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2016

  1. No commit message

    @shenghe
    shenghe committed May 16, 2016
    Configuration menu
    Copy the full SHA
    eb94438 View commit details
    Browse the repository at this point in the history

  2. No commit message

    @shenghe
    shenghe committed May 16, 2016
    Configuration menu
    Copy the full SHA
    30a68a2 View commit details
    Browse the repository at this point in the history

  3. 根据ppt完善答案

    @shenghe
    shenghe committed May 16, 2016
    Configuration menu
    Copy the full SHA
    d48b0b2 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2016

  1. change

    @shenghe
    shenghe committed May 31, 2016
    Configuration menu
    Copy the full SHA
    e8ce263 View commit details
    Browse the repository at this point in the history

  2. No commit message

    @shenghe
    shenghe committed May 31, 2016
    Configuration menu
    Copy the full SHA
    2b4413f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. No commit message

    @shenghe
    shenghe committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    f41e825 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. 完善解析

    @shenghe
    shenghe committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    a8688c2 View commit details
    Browse the repository at this point in the history

  2. No commit message

    @shenghe
    shenghe committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    36d22fb View commit details
    Browse the repository at this point in the history

  3. No commit message

    @shenghe
    shenghe committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    778b04a View commit details
    Browse the repository at this point in the history

  4. No commit message

    @shenghe
    shenghe committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    beff3ee View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. No commit message

    @shenghe
    shenghe committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    a5fff8c View commit details
    Browse the repository at this point in the history

  2. No commit message

    @shenghe
    shenghe committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    e1d5c3a View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. Update main.py 

    update stars_count
    @jtwmyddsgx
    jtwmyddsgx authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    b847e0d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #130 from jtwmyddsgx/patch-1 

    Update main.py
    @shenghe
    shenghe authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    57a2b2c View commit details
    Browse the repository at this point in the history

  3. Update 3_Trip_Advisor.py 

    网站做了更新
    @jtwmyddsgx
    jtwmyddsgx authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    7f56954 View commit details
    Browse the repository at this point in the history

  4. Update main.py 

    租房网更新
    @jtwmyddsgx
    jtwmyddsgx authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    3f97eaf View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge pull request #132 from jtwmyddsgx/patch-3 

    Update main.py
    @shenghe
    shenghe authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    9337c9a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #131 from jtwmyddsgx/patch-2 

    Update 3_Trip_Advisor.py
    @shenghe
    shenghe authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    460618f View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Update homework1VID.py

    @jtwmyddsgx
    jtwmyddsgx authored Jul 19, 2016
    Configuration menu
    Copy the full SHA
    7069b9b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Merge pull request #133 from jtwmyddsgx/patch-5 

    Update homework1VID.py
    @shenghe
    shenghe authored Jul 20, 2016
    Configuration menu
    Copy the full SHA
    8c04563 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2016

  1. Update main.py 

    多进程取商品详情页
    @jtwmyddsgx
    jtwmyddsgx authored Jul 24, 2016
    Configuration menu
    Copy the full SHA
    7533736 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #134 from jtwmyddsgx/patch-6 

    Update main.py
    @shenghe
    shenghe authored Jul 24, 2016
    Configuration menu
    Copy the full SHA
    892122e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2016

  1. Update #20 grades.append(e)

    @majianyu
    majianyu authored Oct 12, 2016
    Configuration menu
    Copy the full SHA
    ece1302 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2016

  1. Merge pull request #136 from MaJianyu/update1_2 

    Update #20 grades.append(e)
    @shenghe
    shenghe authored Oct 17, 2016
    Configuration menu
    Copy the full SHA
    5b8dda2 View commit details
    Browse the repository at this point in the history