Closed Eric-Guo closed 12 years ago
ллһһµģ
20111030գEric Guo < reply@reply.github.com> д
˲ٵطdefaultpixel-enǿ϶Django 1.2еģreviewҵĸģεȫpython 2.7أֻǴdjango 1.2
ϣmicologӦGAEpython 2.7python 2.7ֻṩwebapp2ĸҲ١
θĶ̫˵˼ʵ´һᾡεݽġ
You can merge this Pull Request by running:
git pull https://github.com/Eric-Guo/micolog master
Or you can view, comment on it, or merge it online at:
https://github.com/xuming/micolog/pull/11
-- Commit Summary --
- Upgrade to use Django 1.2
-- File Changes --
M .gitignore (1) M admin.py (2115) M api_rpc.py (1586) A app/filter.py (104) M app/gbtools.py (4) M app/gmemsess.py (4) M app/pingback.py (5) M app/recurse.py (8) M app/safecode.py (2) M app/trackback.py (12) M base.py (618) M blog.py (1212) M complie_text.bat (2) M index.yaml (350) M locale/en_US/LC_MESSAGES/django.mo (0) M locale/en_US/LC_MESSAGES/django.po (2005) M locale/es_AR/LC_MESSAGES/django.mo (0) M locale/es_AR/LC_MESSAGES/django.po (4) M locale/it_IT/LC_MESSAGES/django.mo (0) M locale/it_IT/LC_MESSAGES/django.po (4) M locale/ja/LC_MESSAGES/django.mo (0) M locale/ja/LC_MESSAGES/django.po (10) M locale/zh_CN/LC_MESSAGES/django.mo (0) M locale/zh_CN/LC_MESSAGES/django.po (12) M micolog_plugin.py (12) M micolog_template.py (153) M model.py (1693) M no data run.bat (2) A plugins/live_import/BeautifulSoup.py (2014) A plugins/live_import/SWFUpload.swf (0) A plugins/live_import/XPButtonNoText_160x22.png (0) A plugins/live_import/init.py (1) A plugins/live_import/import.html (248) A plugins/live_import/live_import.py (122) A plugins/live_import/swfupload.js (988) M plugins/sys_plugin/setup.html (4) M plugins/sys_plugin/setup2.html (49) M plugins/sys_plugin/sys_plugin.py (8) M plugins/wordpress/wordpress.py (2) M run.bat (2) M settings.py (4) A static/admin/images/quote.gif (0) M static/admin/style.css (5) A static/js/pagenavi.js (28) M static/js/tiny_mce_config_zh-cn.js (11) M theme_files.py (171) M themes/default/style.css (2) M themes/default/templates/base.html (11) M themes/default/templates/category.html (3) M themes/default/templates/comments.html (40) M themes/default/templates/index.html (8) M themes/default/templates/msg.html (2) M themes/default/templates/page.html (6) M themes/default/templates/single.html (8) A themes/pixel-en/ie.css (16) A themes/pixel-en/ie6.css (17) A themes/pixel-en/images/bg-trans.png (0) A themes/pixel-en/images/bgbody.jpg (0) A themes/pixel-en/images/bggrad.jpg (0) A themes/pixel-en/images/bullet.gif (0) A themes/pixel-en/images/comments.gif (0) A themes/pixel-en/images/gravatar-trans.png (0) A themes/pixel-en/images/lookingbg.jpg (0) A themes/pixel-en/images/more.gif (0) A themes/pixel-en/images/rss-trans.png (0) A themes/pixel-en/images/tags.gif (0) A themes/pixel-en/js/sfhover.js (20) A themes/pixel-en/screenshot.png (0) A themes/pixel-en/style.css (799) A themes/pixel-en/templates/base.html (75) A themes/pixel-en/templates/category.html (41) A themes/pixel-en/templates/comments.html (126) A themes/pixel-en/templates/error-101.html (13) A themes/pixel-en/templates/error-102.html (12) A themes/pixel-en/templates/error.html (5) A themes/pixel-en/templates/error404.html (12) A themes/pixel-en/templates/index.html (45) A themes/pixel-en/templates/month.html (41) A themes/pixel-en/templates/msg.html (5) A themes/pixel-en/templates/page.html (30) A themes/pixel-en/templates/sidebar.html (109) A themes/pixel-en/templates/single.html (34) A themes/pixel-en/templates/tag.html (41) M update.bat (2) M version.txt (139) M views/admin/404.html (2) M views/admin/author.html (4) M views/admin/authors.html (2) M views/admin/base.html (11) M views/admin/categories.html (2) M views/admin/category.html (4) M views/admin/comments.html (2) M views/admin/entry.html (6) M views/admin/filemanager.html (2) M views/admin/import.html (18) M views/admin/link.html (4) M views/admin/links.html (2) M views/admin/pages.html (2) M views/admin/plugin_action.html (4) M views/admin/plugins.html (6) M views/admin/posts.html (2) M views/admin/setup.html (29) M views/admin/setup_base.html (10) M views/admin/sitemap.html (19) M views/admin/status.html (2) M views/admin/tools.html (17) M views/admin/upload.html (28) M views/comments.xml (5) M views/rss.xml (4) M views/sitemap.xml (2) M ziploader/zip_loader.py (6)
-- Patch Links --
https://github.com/xuming/micolog/pull/11.patch https://github.com/xuming/micolog/pull/11.diff
Reply to this email directly or view it on GitHub: https://github.com/xuming/micolog/pull/11
修改了不少地方,default主题和pixel-en主题是肯定可以Django 1.2运行的,请review我的更改,这次的修改完全和python 2.7无关,只是纯粹的升级到django 1.2环境。
在这个基础上,我现在正在修改micolog以适应GAE的python 2.7环境,由于python 2.7只提供webapp2,所以升级的更改也不少。
如果你觉得这次改动太大,先说声不好意思啦,其实下次我会尽量多次递交的。