22 Commits

Author SHA1 Message Date
张旭 1259f40eb5 Set theme jekyll-theme-merlot 2017-02-09 14:11:38 +08:00
zhangxu 33505ecb1f 添加项目展示文件 2016-10-10 17:00:46 +08:00
zhangxu e0aa471ae2 更新 Readme 2016-10-09 14:16:29 +08:00
zhangxu 65efda8fd4 整理多余代码, 2016-10-07 20:58:09 +08:00
zhangxu 8f0e374cfc edit .gitignore 2016-10-07 20:40:50 +08:00
zhangxu 63c753a993 merge two projects, fix the conflicx 2016-10-07 20:32:07 +08:00
zhangxu 336df797a7 整理代码,去除混乱代码 2016-10-07 20:10:35 +08:00
zhangxu 2697b834ed 转换python3代码至python2,更改数据库。 2016-10-07 17:02:52 +08:00
zhangxu cf4d627f6b 转换python3代码至python2,更改数据库。 2016-10-07 17:02:29 +08:00
zhangxu 116c2f415c restart the project 2016-10-07 10:21:36 +08:00
zhangxu 7ff4ddb8e7 restart the program. fix some problem in db,and some unsuitable db table filed 2016-09-19 13:00:08 +08:00
张旭 db0d69b7d4 Update README.md 2015-03-06 13:10:56 +08:00
张旭 bab941d120 change domain 2015-03-04 22:32:43 +08:00
zhangxu1573@qq.com 4d71ee7f30 Merge branch 'master' of https://github.com/zhangxu999/fetchQzone
Conflicts:
	fetchQzone/models.py
	fetchQzone/static/fetchQzone/basic.js
	fetchQzone/templates/fetchQzone/base.html
	fetchQzone/templates/fetchQzone/base_allfeeds.html
	fetchQzone/templates/fetchQzone/base_onefeed.html
	fetchQzone/tests.py
	fetchQzone/urls.py
	fetchQzone/views.py
	mysite/settings.py
	mysite/urls.py
2015-02-28 16:54:10 +08:00
zhangxu1573@qq.com a07c5abfa8 小bug 2015-02-28 16:30:53 +08:00
zhangxu1573@qq.com 6970a91810 添加一切 2015-02-28 15:00:36 +08:00
zhangxu1573@qq.com a2687e736d 测试 2015-02-28 14:33:00 +08:00
zhangxu1573@qq.com cc9352d2ec 添加一切 2015-02-28 13:37:01 +08:00
baeadmin 2003ca0521 add app appidze15c5kbge 2015-02-28 13:27:17 +08:00
zhangxu1573@qq.com fc87b078bf 补充readme 2015-01-13 19:03:39 +08:00
zhangxu1573@qq.com 723167f79b 一次上传 2015-01-13 18:56:35 +08:00
张旭 994efe86aa Initial commit 2015-01-13 18:52:44 +08:00