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.

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

Master #127

Open
wants to merge 359 commits into
base: pr/13
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
b7f720c
Merge pull request #54 from kelaodo/patch-1
mugglecoding Jan 9, 2016
41075b5
Merge pull request #55 from circlechai/patch-2
mugglecoding Jan 9, 2016
f3aae2a
Merge pull request #56 from circlechai/master
mugglecoding Jan 9, 2016
fd30e93
yangruiyou
yangruiyou85 Jan 9, 2016
ee5cbf7
Merge pull request #57 from yangruiyou85/patch-4
mugglecoding Jan 9, 2016
7f6a04d
作业
zhouj1nx1n Jan 9, 2016
34ddb95
Merge remote-tracking branch 'mugglecoding/master' into zhangruochen
Jan 9, 2016
93a82d7
week1-zhangruochen
Jan 9, 2016
d3e25be
Merge pull request #59 from zhangruochen/zhangruochen
mugglecoding Jan 9, 2016
a749bd8
Merge pull request #58 from zhouj1nx1n/patch-1
mugglecoding Jan 9, 2016
5a32399
大作业提交
Jan 9, 2016
83e8987
Merge branch 'mugglecoding/master' into liyan0321
Jan 9, 2016
6549110
week homework
QuantVela Jan 9, 2016
185b738
Merge branch 'mugglecoding/master' into huangxiaoming
smallming36 Jan 9, 2016
3cf3353
提交大作业
Kylinlin Jan 9, 2016
8867822
第三次大作业
huyongsheng Jan 9, 2016
4cbc51d
liyan
Jan 9, 2016
dd20d70
Merge branch 'mugglecoding/master' into liyan0321
Jan 9, 2016
f6d5270
Delete liyan00.py
liyan0321 Jan 10, 2016
676d4d2
Delete liyan000.py
liyan0321 Jan 10, 2016
4a9baf6
合并分支
leiyue Jan 10, 2016
18b9036
Merge remote-tracking branch 'origin/master'
leiyue Jan 10, 2016
10a1f43
合并分支
leiyue Jan 10, 2016
f37904e
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 10, 2016
cd26592
Create zhangguifeng
zhangguifeng Jan 10, 2016
7204dc0
大作业提交
zhangguifeng Jan 10, 2016
822c876
Merge pull request #66 from zhangguifeng/zhangguifeng
mugglecoding Jan 10, 2016
c0a0088
week2
QuantVela Jan 11, 2016
a2c46d6
2.1 homework
miaozaiye Jan 12, 2016
f3b9463
Add Week02 File
Jan 12, 2016
028ffdb
Merge remote-tracking branch 'mugglecoding/master' into liangzishan
Jan 12, 2016
49b25e2
Change some file
Jan 12, 2016
ce1c0b9
week2
QuantVela Jan 12, 2016
5a56393
week2up
QuantVela Jan 12, 2016
2d47735
1.2answerupdate
QuantVela Jan 13, 2016
9b4c38a
Merge pull request #33 from gongminghui/gongminghui
mugglecoding Jan 13, 2016
9f03820
Merge pull request #32 from lzsdodo/liangzishan
mugglecoding Jan 13, 2016
0ca6ef5
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
zhukai2015 Jan 13, 2016
ea9e128
Merge remote-tracking branch 'refs/remotes/origin/zhukai'
zhukai2015 Jan 13, 2016
7b7d671
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 13, 2016
815fbc6
2.1作业提交
leiyue Jan 13, 2016
f58b978
a
QuantVela Jan 13, 2016
2d08fa2
Merge pull request #62 from Kylinlin/linguanhao
mugglecoding Jan 13, 2016
c51679c
Merge pull request #67 from miaozaiye/Miaozaiye
mugglecoding Jan 13, 2016
f974b02
Merge pull request #65 from zhangguifeng/patch-2
mugglecoding Jan 13, 2016
b74b016
Merge pull request #64 from liyan0321/liyan0321
mugglecoding Jan 13, 2016
27c1c80
leiyue
QuantVela Jan 13, 2016
f7b852b
2.1someone
QuantVela Jan 13, 2016
919b435
Add
xjlin Jan 13, 2016
8e272c6
2.2作业提交
leiyue Jan 13, 2016
d0114ae
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 13, 2016
380ab8c
和 upstream 仓库保持队形
leiyue Jan 13, 2016
428390c
移动 2.2 作业的 README.md 方便大家了解
leiyue Jan 13, 2016
0114367
修改 README.md 排版,讨厌的 GFM
leiyue Jan 13, 2016
3f700f9
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
zhukai2015 Jan 13, 2016
d36aec2
Merge pull request #68 from xjlin/linxingjian
mugglecoding Jan 13, 2016
7acee99
2.1-zhaocong
wormzc Jan 14, 2016
3c0e738
Merge pull request #70 from wormzc/zhaocong
mugglecoding Jan 14, 2016
c5151d9
修改1.3练习题crawl_list未使用的bug
zhenchaozhu Jan 14, 2016
8d54763
zhaocong
wormzc Jan 14, 2016
b86dd00
week1大作业
Woowoody Jan 14, 2016
14a4655
1.3wudi
Woowoody Jan 14, 2016
59dc74c
Create zhangruochenweek2
zhangruochen Jan 14, 2016
76af661
week2-zhangruochen
Jan 14, 2016
0732a73
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
zhukai2015 Jan 14, 2016
2aaf252
加入商户入口
leiyue Jan 14, 2016
da0a235
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 14, 2016
c154833
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
Jan 15, 2016
52b39a7
Merge remote-tracking branch 'refs/remotes/origin/master' into zhangx…
Jan 15, 2016
2b61c74
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
Jan 15, 2016
b96112a
week2-zhangxiaoxi
Jan 15, 2016
1af6524
Merge remote-tracking branch 'mugglecoding/master' into wangming
Mingwang1986 Jan 15, 2016
ea7c1fd
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
wormzc Jan 15, 2016
e289a45
zhaocong
wormzc Jan 15, 2016
f67cb55
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
wormzc Jan 15, 2016
19f7a66
1
wormzc Jan 15, 2016
1fa1610
Revert "1"
wormzc Jan 15, 2016
a922b77
2
wormzc Jan 15, 2016
3d9df8a
Revert "2"
wormzc Jan 15, 2016
3a37009
第二周大作业提交
yinwanmei Jan 15, 2016
f2c7f52
git pull from orgin
xczswt1993 Jan 15, 2016
0fc90c0
commit from shiwentao
xczswt1993 Jan 15, 2016
ea3d430
Merge pull request #73 from yinwanmei/patch-1
mugglecoding Jan 15, 2016
dc63ae4
Merge pull request #72 from zhangruochen/patch-1
mugglecoding Jan 15, 2016
2b489ac
Merge pull request #71 from wormzc/zhaocong
mugglecoding Jan 15, 2016
f696816
yaobozhangweek2
yaobozhang Jan 15, 2016
47afec0
modify function get_info
xczswt1993 Jan 15, 2016
e5e1cde
作业
j-how Jan 15, 2016
b8bc41c
Merge branch 'mugglecoding/master' into yangguang
UXplayer Jan 15, 2016
ad397da
Merge pull request #78 from j-how/master
mugglecoding Jan 15, 2016
e6cdc2e
Merge pull request #77 from zhangxiaoxi083/zhangxiaoxi
mugglecoding Jan 15, 2016
4b1b505
Merge pull request #76 from yaobozhang/yaobozhang
mugglecoding Jan 15, 2016
6a5070b
Merge pull request #74 from xczswt1993/master
mugglecoding Jan 15, 2016
e417a12
提交
Kylinlin Jan 16, 2016
9fee41a
提交大作业
Kylinlin Jan 16, 2016
1449a33
2.1
you-shu Jan 16, 2016
020058d
gaoxiangdong_week02
iamgxd01 Jan 16, 2016
b07b35f
Revert "maizhenchao"
MaiZhenchao Jan 16, 2016
5bec40a
第二周作业
MaiZhenchao Jan 16, 2016
956aec9
Merge remote-tracking branch 'mugglecoding/master' into liangzishan
Jan 16, 2016
7abc908
Week2 Change
Jan 16, 2016
ebaccfa
Merge pull request #85 from lzsdodo/liangzishan
mugglecoding Jan 16, 2016
854fae6
Merge pull request #84 from MaiZhenchao/MaiZhenchao
mugglecoding Jan 16, 2016
7a6b0ce
Merge pull request #82 from gongminghui/patch-3
mugglecoding Jan 16, 2016
3e77b56
Merge pull request #81 from Kylinlin/linguanhao
mugglecoding Jan 16, 2016
505a744
Merge pull request #80 from huyongsheng/master
mugglecoding Jan 16, 2016
c9462dd
Merge pull request #79 from huyongsheng/huyongsheng
mugglecoding Jan 16, 2016
6ba9b9b
Merge pull request #83 from iamgxd01/master
mugglecoding Jan 16, 2016
59a2739
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
MaiZhenchao Jan 16, 2016
29f3d38
Create Du_Boxing_exercise_2
Prof-L Jan 16, 2016
ec4dc93
2.1作业提交
MaiZhenchao Jan 16, 2016
29ef6b8
Merge branch 'mugglecoding/master' into huangxiaoming
smallming36 Jan 16, 2016
f32f939
huangxiaoming
smallming36 Jan 16, 2016
fdd5c1a
week2
UXplayer Jan 16, 2016
055913f
Merge pull request #88 from smallming36/huangxiaoming
mugglecoding Jan 16, 2016
d5e291a
Merge pull request #87 from MaiZhenchao/MaiZhenchao
mugglecoding Jan 16, 2016
4295ccf
Merge pull request #86 from Arthurdu/patch-1
mugglecoding Jan 16, 2016
6361413
delete fucking huamingce
QuantVela Jan 16, 2016
b6d4015
Merge pull request #89 from UXplayer/yangguang
mugglecoding Jan 16, 2016
6eb25ab
Merge pull request #1 from mugglecoding/master
zhangzhexu Jan 16, 2016
a951aca
1231
zhangzhexu Jan 16, 2016
9795671
week2done
QuantVela Jan 17, 2016
8969252
alittlechange
QuantVela Jan 17, 2016
da1eda5
charts
QuantVela Jan 17, 2016
97992f6
removeweek1homework
QuantVela Jan 17, 2016
7c90eb5
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
zhukai2015 Jan 17, 2016
4cb94ae
week2datacomeback
QuantVela Jan 17, 2016
3850dd1
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
zhukai2015 Jan 17, 2016
e21542a
Merge remote-tracking branch 'mugglecoding/master' into sushun
Jan 17, 2016
bc2e492
sushun
Jan 17, 2016
c8d8617
yaobozhang
yaobozhang Jan 17, 2016
9666254
Merge remote-tracking branch 'mugglecoding/master'
Mingwang1986 Jan 17, 2016
50d201a
Merge branch 'wangming'
Mingwang1986 Jan 17, 2016
eca0660
Merge remote-tracking branch 'mugglecoding/master'
Mingwang1986 Jan 17, 2016
2d5f71c
homework-week2
Mingwang1986 Jan 17, 2016
c7e68d6
Merge pull request #92 from Mingwang1986/master
mugglecoding Jan 17, 2016
3a4185a
Merge pull request #91 from yaobozhang/yaobozhang
mugglecoding Jan 17, 2016
e6c8ec6
Merge pull request #90 from sushun1991/sushun
mugglecoding Jan 17, 2016
c83d259
Merge remote-tracking branch 'refs/remotes/origin/master' into zhaocong
wormzc Jan 18, 2016
6728bed
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
wormzc Jan 18, 2016
f8de552
大作业2
zhukai2015 Jan 19, 2016
7b405f1
3.2&3.3update
QuantVela Jan 21, 2016
fd9f3c6
3.2&3.3vdcode
QuantVela Jan 21, 2016
d876155
Merge pull request #2 from mugglecoding/master
zhangzhexu Jan 21, 2016
491b4e0
week-guozifeng
gzifeng Jan 21, 2016
54bcd76
week3homework
QuantVela Jan 21, 2016
a00b664
3.4code
QuantVela Jan 23, 2016
137dbec
Merge remote-tracking branch 'mugglecoding/master' into Miaozaiye
miaozaiye Jan 23, 2016
f17e110
week3gogogo
QuantVela Jan 24, 2016
2cfdd46
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
wormzc Jan 24, 2016
c068be6
第二周大作业-wudi
Woowoody Jan 24, 2016
38054c9
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
Woowoody Jan 24, 2016
13b86ca
Merge pull request #97 from Woowoody/wudi
mugglecoding Jan 24, 2016
a82ac29
Merge pull request #96 from DarkRepulsor/guozifeng
mugglecoding Jan 24, 2016
cbffdf0
Merge pull request #95 from zhangzhexu/master
mugglecoding Jan 24, 2016
dce0cf8
Merge pull request #94 from zhukai2015/master
mugglecoding Jan 24, 2016
782bdbb
Merge pull request #93 from wormzc/zhaocong
mugglecoding Jan 24, 2016
01e5d7e
Merge remote-tracking branch 'mugglecoding/master' into Miaozaiye
miaozaiye Jan 24, 2016
67721e3
Merge pull request #98 from huyongsheng/master
mugglecoding Jan 25, 2016
56e10da
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
MaiZhenchao Jan 25, 2016
fff522d
第三周作业0125
iamgxd01 Jan 25, 2016
518d7b9
miaozaiye w2 homework
miaozaiye Jan 26, 2016
da67802
Merge pull request #99 from iamgxd01/master
mugglecoding Jan 26, 2016
6e440a0
nope
Lasergrand Jan 26, 2016
602bfef
1
Lasergrand Jan 26, 2016
d8c7059
Merge pull request #1 from Lasergrand/Lasergrand
Lasergrand Jan 26, 2016
b71d701
1
Lasergrand Jan 26, 2016
96bd65b
Revert "nope"
Lasergrand Jan 26, 2016
d7db112
1
Lasergrand Jan 26, 2016
6e8f8ba
123
Lasergrand Jan 26, 2016
c012984
1
Lasergrand Jan 26, 2016
e4555f9
0.1
Lasergrand Jan 26, 2016
893896c
0.2
Lasergrand Jan 26, 2016
91b36d0
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
MaiZhenchao Jan 26, 2016
3c777ba
这次作业比较艰辛,好不容易弄好了!
xczswt1993 Jan 26, 2016
d15ea4f
3.2 homework
leiyue Jan 26, 2016
3978512
ignore ipynb_checkpoints
leiyue Jan 26, 2016
9a8b6eb
Merge pull request #102 from xczswt1993/master
mugglecoding Jan 27, 2016
bc71755
Merge pull request #101 from Lasergrand/Lasergrand
mugglecoding Jan 27, 2016
de7579a
Merge pull request #100 from Lasergrand/revert-1-Lasergrand
mugglecoding Jan 27, 2016
f84abea
3.3 homework
leiyue Jan 27, 2016
b97413f
3.3 item_info.count
leiyue Jan 27, 2016
9caa250
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 27, 2016
ebe1843
大作业
leiyue Jan 27, 2016
e08af67
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
MaiZhenchao Jan 27, 2016
3b2146a
大作业提交
MaiZhenchao Jan 27, 2016
64cb0d0
wudi
Woowoody Jan 28, 2016
f882304
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
Woowoody Jan 28, 2016
79eafe2
3.3-wudi
Woowoody Jan 28, 2016
f47d6a6
Merge pull request #104 from Woowoody/wudi
mugglecoding Jan 28, 2016
076ebf7
Merge pull request #103 from MaiZhenchao/MaiZhenchao
mugglecoding Jan 28, 2016
f90fbf0
create chaiyuan.py
circlechai Jan 28, 2016
c79b78f
homework3_youshu
you-shu Jan 28, 2016
b7539e1
3.3 homework
miaozaiye Jan 28, 2016
96bc3d0
Merge pull request #107 from miaozaiye/Miaozaiye
mugglecoding Jan 29, 2016
feb3319
Merge pull request #106 from gongminghui/patch-4
mugglecoding Jan 29, 2016
23c7956
Merge pull request #105 from circlechai/patch-1
mugglecoding Jan 29, 2016
8d8ee59
week4go
QuantVela Jan 29, 2016
e8bfb2d
4.1fix
QuantVela Jan 30, 2016
7108dd2
4.2go!
QuantVela Jan 31, 2016
5e2f647
4.3
QuantVela Feb 3, 2016
7539cc8
done
QuantVela Feb 19, 2016
94075fc
1.3change
QuantVela Feb 21, 2016
cf4c502
update
QuantVela Mar 2, 2016
7023ef5
1.3update
QuantVela Mar 7, 2016
bc82b2a
sample_data update
QuantVela Mar 20, 2016
a21a48e
shenghe Apr 7, 2016
18ea73a
4.2arti_info
QuantVela Apr 17, 2016
34f8273
浏览量的抓取做了反爬虫,因此加上header信息,不然返回为空
kprot May 9, 2016
918b6f0
Merge pull request #128 from AJKipper/master
mugglecoding May 10, 2016
5c43f3a
update
shenghe May 11, 2016
169bcf4
添加自动提取详情
shenghe May 11, 2016
c2ded58
Update homework1VID.py
shenghe May 12, 2016
946601e
Update homework1VID.py
shenghe May 12, 2016
e20653a
Update main.py
shenghe May 12, 2016
02b76df
Update page_parsing.py
shenghe May 12, 2016
cfe2b8e
Update counts.py
shenghe May 12, 2016
a74daad
Update channel_extracing.py
shenghe May 12, 2016
2afeaf3
Update main.py
shenghe May 12, 2016
91f7a4f
Update readme.md
shenghe May 12, 2016
c2c51e8
Update settings.py
shenghe May 12, 2016
a409f7d
Delete db.sqlite3
shenghe May 12, 2016
3886823
Update urls.py
shenghe May 12, 2016
165cf0a
增加问题解答整理链接
kprot May 12, 2016
23695c8
Merge pull request #129 from AJKipper/master
kprot May 12, 2016
58d22f9
shenghe May 15, 2016
eb94438
shenghe May 16, 2016
30a68a2
shenghe May 16, 2016
d48b0b2
根据ppt完善答案
shenghe May 16, 2016
e8ce263
change
shenghe May 31, 2016
2b4413f
shenghe May 31, 2016
f41e825
shenghe Jun 1, 2016
a8688c2
完善解析
shenghe Jun 2, 2016
36d22fb
shenghe Jun 2, 2016
778b04a
shenghe Jun 2, 2016
beff3ee
shenghe Jun 2, 2016
a5fff8c
shenghe Jun 14, 2016
e1d5c3a
shenghe Jun 14, 2016
b847e0d
Update main.py
jtwmyddsgx Jun 26, 2016
57a2b2c
Merge pull request #130 from jtwmyddsgx/patch-1
shenghe Jun 26, 2016
7f56954
Update 3_Trip_Advisor.py
jtwmyddsgx Jun 26, 2016
3f97eaf
Update main.py
jtwmyddsgx Jun 26, 2016
9337c9a
Merge pull request #132 from jtwmyddsgx/patch-3
shenghe Jun 28, 2016
460618f
Merge pull request #131 from jtwmyddsgx/patch-2
shenghe Jun 28, 2016
7069b9b
Update homework1VID.py
jtwmyddsgx Jul 19, 2016
8c04563
Merge pull request #133 from jtwmyddsgx/patch-5
shenghe Jul 20, 2016
7533736
Update main.py
jtwmyddsgx Jul 24, 2016
892122e
Merge pull request #134 from jtwmyddsgx/patch-6
shenghe Jul 24, 2016
ece1302
Update #20 grades.append(e)
majianyu Oct 12, 2016
5b8dda2
Merge pull request #136 from MaJianyu/update1_2
shenghe Oct 17, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
69 changes: 69 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
### Example user template template
### Example user template

# IntelliJ project files
.idea
*.iml
out
gen

### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
.ipynb_checkpoints

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/
1 change: 0 additions & 1 deletion 1.1练习作业提交/1.1练习-linqianqian/.idea/.name

This file was deleted.

12 changes: 0 additions & 12 deletions 1.1练习作业提交/1.1练习-linqianqian/.idea/1.1练习.iml

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions 1.1练习作业提交/1.1练习-linqianqian/.idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions 1.1练习作业提交/1.1练习-linqianqian/.idea/modules.xml

This file was deleted.

Loading