Skip to content

Commit

Permalink
Merge pull request #167 from liangliangyy/dev
Browse files Browse the repository at this point in the history
升级依赖,完善文档。
  • Loading branch information
liangliangyy committed Oct 5, 2018
2 parents d35a1d6 + 46837f2 commit ccbd7fe
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 17 deletions.
9 changes: 9 additions & 0 deletions bin/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,12 @@ SERVER_EMAIL = os.environ.get('DJANGO_EMAIL_USER')
## 网站配置介绍
**后台->BLOG->网站配置**中,可以新增网站配置,比如关键字,描述等,以及谷歌广告,网站统计代码及备案号等等。
其中的*静态文件保存地址*是保存oauth用户登录的头像路径,填写绝对路径,默认是代码目录。
## 代码高亮
如果你发现你文章的代码没有高亮,请这样书写代码块:
```python
import os
def fun():
print("hello")
fun()
```
也就是说,需要在代码块开始位置加入这段代码对应的语言。
22 changes: 14 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
appdirs==1.4.3
asn1crypto==0.24.0
astroid==2.0.4
bottle==0.12.13
certifi==2018.8.24
cffi==1.11.5
chardet==3.0.4
coverage==4.5.1
cryptography==2.3.1
Django==2.1.1
Django==2.1.2
django-appconf==1.0.2
django-autoslug==1.9.3
django-compressor==2.2
django-debug-toolbar==1.9.1
django-debug-toolbar==1.10.1
django-haystack==2.8.1
django-ipware==2.1.0
django-pagedown==1.0.6
django-uuslug==1.1.8
idna==2.7
isort==4.3.4
jieba==0.39
jsonpickle==0.9.6
markdown2==2.3.5
jsonpickle==1.0
lazy-object-proxy==1.3.1
markdown2==2.3.6
mccabe==0.6.1
mistune==0.8.3
olefile==0.45.1
packaging==17.1
Pillow==5.2.0
olefile==0.46
packaging==18.0
Pillow==5.3.0
pycparser==2.18
Pygments==2.2.0
pylint==2.1.1
PyMySQL==0.9.2
pyparsing==2.2.0
pyparsing==2.2.2
python-memcached==1.59
python-slugify==1.2.6
pytz==2018.5
Expand All @@ -41,4 +46,5 @@ urllib3==1.23
webencodings==0.5.1
WeRoBot==1.6.0
Whoosh==2.7.4
wrapt==1.10.11
xmltodict==0.11.0
25 changes: 16 additions & 9 deletions travis_test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
appdirs==1.4.3
asn1crypto==0.24.0
astroid==2.0.4
bottle==0.12.13
certifi==2018.8.24
cffi==1.11.5
chardet==3.0.4
coverage==4.5.1
cryptography==2.3.1
Django==2.1.1
Django==2.1.2
django-appconf==1.0.2
django-autoslug==1.9.3
django-compressor==2.2
django-debug-toolbar==1.9.1
django-debug-toolbar==1.10.1
django-haystack==2.8.1
django-ipware==2.1.0
django-pagedown==1.0.6
django-uuslug==1.1.8
idna==2.7
isort==4.3.4
jieba==0.39
jsonpickle==0.9.6
markdown2==2.3.5
jsonpickle==1.0
lazy-object-proxy==1.3.1
markdown2==2.3.6
mccabe==0.6.1
mistune==0.8.3
olefile==0.45.1
packaging==17.1
Pillow==5.2.0
olefile==0.46
packaging==18.0
Pillow==5.3.0
pycparser==2.18
Pygments==2.2.0
pylint==2.1.1
PyMySQL==0.9.2
pyparsing==2.2.0
pyparsing==2.2.2
python-memcached==1.59
python-slugify==1.2.6
pytz==2018.5
raven==6.9.0
Expand All @@ -40,4 +46,5 @@ urllib3==1.23
webencodings==0.5.1
WeRoBot==1.6.0
Whoosh==2.7.4
xmltodict==0.11.0
wrapt==1.10.11
xmltodict==0.11.0

0 comments on commit ccbd7fe

Please sign in to comment.