Commits · f7d0ef7f1dcb20468523bc02c6d090d4735164b9 · GitHubExcellent / Django Blog Tutorial

15 Jun, 2017 5 commits
- 增加项目依赖 · f7d0ef7f
  yangxg authored 8 years ago
  
  f7d0ef7f
- Merge branch 'demo' · 49aec8ca
  yangxg authored 8 years ago
```
# Conflicts:
#	requirements.txt
```
  49aec8ca
- 增加项目依赖 · 89d08aac
  yangxg authored 8 years ago
  
  89d08aac
- Merge branch 'Step26_full-text-search-using-django-haystack' into demo · feb4a2fe
  yangxg authored 8 years ago
  
  feb4a2fe
- Step26: full text search using django haystack · b888e011
  yangxg authored 8 years ago
  
  b888e011
11 Jun, 2017 1 commit
- Step25: simple search · 27fae6f1
  yangxg authored 8 years ago
  
  27fae6f1
08 Jun, 2017 6 commits
- Merge branch 'Step24_extract-content-automatically-using-markdown' · b1320f53
  yangxg authored 8 years ago
  
  b1320f53
- Merge branch 'Step24_extract-content-automatically-using-markdown' into demo · c7062800
  yangxg authored 8 years ago
  
  c7062800
- Step24: extract content automatically using markdown · 304d6bdd
  yangxg authored 8 years ago
  
  304d6bdd
- Merge branch 'Step23_rss-feed' · 57fde6a5
  yangxg authored 8 years ago
  
  57fde6a5
- Merge branch 'Step23_rss-feed' into demo · 089927d4
  yangxg authored 8 years ago
```
# Conflicts:
#	blogproject/urls.py
```
  089927d4
- Step23: rss feed · 0228e2f9
  yangxg authored 8 years ago
  
  0228e2f9
07 Jun, 2017 5 commits
- 更新 readme，修复不兼容 Python 2 的问题 · e953fb5f
  yangxg authored 8 years ago
  
  e953fb5f
- Merge branch 'Step22_tag-cloud' · 86e4d5bb
  yangxg authored 8 years ago
  
  86e4d5bb
- 修改 settings · cec6b395
  yangxg authored 8 years ago
  
  cec6b395
- Merge branch 'Step22_tag-cloud' into demo · d4f2388c
  yangxg authored 8 years ago
  
  d4f2388c
- Step22: tag cloud · f8c6c066
  yangxg authored 8 years ago
  
  f8c6c066
03 Jun, 2017 1 commit
- 更新 README · 2dcb3082
  yangxg authored 8 years ago
  
  2dcb3082
02 Jun, 2017 3 commits
- Merge branch 'Step21_number-of-post-in-category' · b114fb2c
  yangxg authored 8 years ago
  
  b114fb2c
- Merge branch 'Step21_number-of-post-in-category' into demo · a534c42c
  yangxg authored 8 years ago
  
  a534c42c
- Step21: number of post in category · 1438df2b
  yangxg authored 8 years ago
  
  1438df2b
31 May, 2017 4 commits
- fix: 默认分页项目数改为 10 · 8e34b2a1
  yangxg authored 8 years ago
  
  8e34b2a1
- Merge branch 'Step20_complete-pagination' · 2d24d804
  yangxg authored 8 years ago
  
  2d24d804
- Merge branch 'Step20_complete-pagination' into demo · 412ca40c
  yangxg authored 8 years ago
  
  412ca40c
- Step20: complete pagination · 69a4cdfa
  yangxg authored 8 years ago
  
  69a4cdfa
24 May, 2017 3 commits
- Merge branch 'Step19_simple-pagination' · cbd321ac
  yangxg authored 8 years ago
  
  cbd321ac
- Merge branch 'Step19_simple-pagination' into demo · f6a5b319
  yangxg authored 8 years ago
  
  f6a5b319
- Step19: simple pagination · 3a30ec1c
  yangxg authored 8 years ago
  
  3a30ec1c
22 May, 2017 3 commits
- Merge branch 'Step18_class-based-views' · de9ffd50
  yangxg authored 8 years ago
  
  de9ffd50
- Merge branch 'Step18_class-based-views' into demo · c22b791a
  yangxg authored 8 years ago
  
  c22b791a
- Step18: class based views · d141e884
  yangxg authored 8 years ago
  
  d141e884
20 May, 2017 8 commits
- 添加 robots 规则 · 5b66f3bf
  yangxg authored 8 years ago
  
  5b66f3bf
- Merge remote-tracking branch 'origin/master' · 846ee8ed
  yangxg authored 8 years ago
  
  846ee8ed
- 修改 README · c145b9df
  yangxg authored 8 years ago
  
  c145b9df
- fix: add requirements.txt · 74a8639b
  yangxg authored 8 years ago
  
  74a8639b
- Merge remote-tracking branch 'origin/demo' into demo · ee9bc6d7
  yangxg authored 8 years ago
```
# Conflicts:
#	blog/models.py
```
  ee9bc6d7
- ready for demo deploy · e0176d07
  yangxg authored 8 years ago
  
  e0176d07
- 删除分支下的 readme 文件 · fa73d74f
  yangxg authored 8 years ago
  
  fa73d74f
- Step17: generate excerpt automatically · 933fbdd3
  yangxg authored 8 years ago
  
  933fbdd3
19 May, 2017 1 commit
- fix: add requirements.txt · de246fb5
  yangxg authored 8 years ago
  
  de246fb5