Permalink
Browse files

Merge pull request #11 from Eric-Guo/master

Step 1 to python 2.7, fully upgrade to Django 1.2 for micolog
  • Loading branch information...
2 parents 374e4fe + 7d4ddb5 commit f93c01245ec12597821511be216d1b90a9c0ff90 @xuming committed Nov 13, 2011
Showing with 10,207 additions and 5,382 deletions.
  1. +2 −0 .gitignore
  2. +1,052 −1,063 admin.py
  3. +793 −793 api_rpc.py
  4. +103 −99 { → app}/filter.py
  5. +2 −2 app/gbtools.py
  6. +2 −2 app/gmemsess.py
  7. +2 −3 app/pingback.py
  8. +6 −2 app/recurse.py
  9. +1 −1 app/safecode.py
  10. +7 −5 app/trackback.py
  11. +0 −55 appengine_console.py
  12. +299 −319 base.py
  13. +584 −628 blog.py
  14. +1 −1 complie_text.bat
  15. +183 −167 index.yaml
  16. BIN locale/en_US/LC_MESSAGES/django.mo
  17. +1,032 −973 locale/en_US/LC_MESSAGES/django.po
  18. BIN locale/es_AR/LC_MESSAGES/django.mo
  19. +2 −2 locale/es_AR/LC_MESSAGES/django.po
  20. BIN locale/it_IT/LC_MESSAGES/django.mo
  21. +2 −2 locale/it_IT/LC_MESSAGES/django.po
  22. BIN locale/ja/LC_MESSAGES/django.mo
  23. +7 −3 locale/ja/LC_MESSAGES/django.po
  24. BIN locale/zh_CN/LC_MESSAGES/django.mo
  25. +6 −6 locale/zh_CN/LC_MESSAGES/django.po
  26. +5 −7 micolog_plugin.py
  27. +75 −78 micolog_template.py
  28. +831 −862 model.py
  29. +1 −1 no data run.bat
  30. +2,014 −0 plugins/live_import/BeautifulSoup.py
  31. BIN plugins/live_import/SWFUpload.swf
  32. BIN plugins/live_import/XPButtonNoText_160x22.png
  33. +1 −0 plugins/live_import/__init__.py
  34. +248 −0 plugins/live_import/import.html
  35. +122 −0 plugins/live_import/live_import.py
  36. +988 −0 plugins/live_import/swfupload.js
  37. +2 −2 plugins/sys_plugin/setup.html
  38. +24 −25 plugins/sys_plugin/setup2.html
  39. +2 −6 plugins/sys_plugin/sys_plugin.py
  40. +1 −1 plugins/wordpress/wordpress.py
  41. +1 −1 run.bat
  42. +1 −3 settings.py
  43. BIN static/admin/images/quote.gif
  44. +2 −3 static/admin/style.css
  45. +28 −0 static/js/pagenavi.js
  46. +3 −8 static/js/tiny_mce_config_zh-cn.js
  47. +85 −86 theme_files.py
  48. +1 −1 themes/default/style.css
  49. +6 −5 themes/default/templates/base.html
  50. +0 −3 themes/default/templates/category.html
  51. +25 −15 themes/default/templates/comments.html
  52. +6 −2 themes/default/templates/index.html
  53. +1 −1 themes/default/templates/msg.html
  54. +3 −3 themes/default/templates/page.html
  55. +4 −4 themes/default/templates/single.html
  56. +16 −0 themes/pixel-en/ie.css
  57. +17 −0 themes/pixel-en/ie6.css
  58. BIN themes/pixel-en/images/bg-trans.png
  59. BIN themes/pixel-en/images/bgbody.jpg
  60. BIN themes/pixel-en/images/bggrad.jpg
  61. BIN themes/pixel-en/images/bullet.gif
  62. BIN themes/pixel-en/images/comments.gif
  63. BIN themes/pixel-en/images/gravatar-trans.png
  64. BIN themes/pixel-en/images/lookingbg.jpg
  65. BIN themes/pixel-en/images/more.gif
  66. BIN themes/pixel-en/images/rss-trans.png
  67. BIN themes/pixel-en/images/tags.gif
  68. +20 −0 themes/pixel-en/js/sfhover.js
  69. BIN themes/pixel-en/screenshot.png
  70. +799 −0 themes/pixel-en/style.css
  71. +75 −0 themes/pixel-en/templates/base.html
  72. +41 −0 themes/pixel-en/templates/category.html
  73. +126 −0 themes/pixel-en/templates/comments.html
  74. +13 −0 themes/pixel-en/templates/error-101.html
  75. +12 −0 themes/pixel-en/templates/error-102.html
  76. +5 −0 themes/pixel-en/templates/error.html
  77. +12 −0 themes/pixel-en/templates/error404.html
  78. +45 −0 themes/pixel-en/templates/index.html
  79. +41 −0 themes/pixel-en/templates/month.html
  80. +5 −0 themes/pixel-en/templates/msg.html
  81. +30 −0 themes/pixel-en/templates/page.html
  82. +109 −0 themes/pixel-en/templates/sidebar.html
  83. +34 −0 themes/pixel-en/templates/single.html
  84. +41 −0 themes/pixel-en/templates/tag.html
  85. +1 −1 update.bat
  86. +85 −57 version.txt
  87. +1 −1 views/admin/404.html
  88. +2 −2 views/admin/author.html
  89. +1 −1 views/admin/authors.html
  90. +7 −4 views/admin/base.html
  91. +1 −1 views/admin/categories.html
  92. +2 −2 views/admin/category.html
  93. +1 −1 views/admin/comments.html
  94. +3 −3 views/admin/entry.html
  95. +1 −1 views/admin/filemanager.html
  96. +13 −5 views/admin/import.html
  97. +2 −2 views/admin/link.html
  98. +1 −1 views/admin/links.html
  99. +1 −1 views/admin/pages.html
  100. +2 −2 views/admin/plugin_action.html
  101. +3 −3 views/admin/plugins.html
  102. +1 −1 views/admin/posts.html
  103. +21 −8 views/admin/setup.html
  104. +5 −5 views/admin/setup_base.html
  105. +13 −6 views/admin/sitemap.html
  106. +1 −1 views/admin/status.html
  107. +12 −5 views/admin/tools.html
  108. +10 −18 views/admin/upload.html
  109. +3 −2 views/comments.xml
  110. +2 −2 views/rss.xml
  111. +1 −1 views/sitemap.xml
  112. +4 −2 ziploader/zip_loader.py
View
@@ -1,4 +1,6 @@
.DS_Store
+.idea
+*.bak
*.pyc
*.pyo
.bzr
Oops, something went wrong.

0 comments on commit f93c012

Please sign in to comment.