Permalink
Browse files

[soc2009/admin-ui] Merging up to trunk svn:r11382 into my branch (thi…

…s time from the right directory)

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@11400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 98fc6a1 commit ba47aebc6d88f64249faec8bad6239ae2998db89 @zain zain committed Aug 5, 2009
Showing with 21,697 additions and 10,466 deletions.
  1. +5 −1 AUTHORS
  2. +2 −3 django/__init__.py
  3. BIN django/conf/locale/ar/LC_MESSAGES/django.mo
  4. +111 −68 django/conf/locale/ar/LC_MESSAGES/django.po
  5. BIN django/conf/locale/bn/LC_MESSAGES/django.mo
  6. +3,494 −1,446 django/conf/locale/bn/LC_MESSAGES/django.po
  7. BIN django/conf/locale/bn/LC_MESSAGES/djangojs.mo
  8. +38 −42 django/conf/locale/bn/LC_MESSAGES/djangojs.po
  9. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  10. +321 −228 django/conf/locale/ca/LC_MESSAGES/django.po
  11. BIN django/conf/locale/cs/LC_MESSAGES/django.mo
  12. +1,285 −914 django/conf/locale/cs/LC_MESSAGES/django.po
  13. BIN django/conf/locale/da/LC_MESSAGES/django.mo
  14. +477 −662 django/conf/locale/da/LC_MESSAGES/django.po
  15. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  16. +135 −97 django/conf/locale/de/LC_MESSAGES/django.po
  17. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  18. +321 −235 django/conf/locale/es/LC_MESSAGES/django.po
  19. BIN django/conf/locale/es_AR/LC_MESSAGES/django.mo
  20. +104 −99 django/conf/locale/es_AR/LC_MESSAGES/django.po
  21. BIN django/conf/locale/et/LC_MESSAGES/django.mo
  22. +186 −143 django/conf/locale/et/LC_MESSAGES/django.po
  23. BIN django/conf/locale/fi/LC_MESSAGES/django.mo
  24. +657 −305 django/conf/locale/fi/LC_MESSAGES/django.po
  25. BIN django/conf/locale/he/LC_MESSAGES/django.mo
  26. +277 −684 django/conf/locale/he/LC_MESSAGES/django.po
  27. BIN django/conf/locale/it/LC_MESSAGES/django.mo
  28. +223 −171 django/conf/locale/it/LC_MESSAGES/django.po
  29. BIN django/conf/locale/it/LC_MESSAGES/djangojs.mo
  30. +5 −4 django/conf/locale/it/LC_MESSAGES/djangojs.po
  31. BIN django/conf/locale/ja/LC_MESSAGES/django.mo
  32. +253 −173 django/conf/locale/ja/LC_MESSAGES/django.po
  33. BIN django/conf/locale/ja/LC_MESSAGES/djangojs.mo
  34. +2 −2 django/conf/locale/ja/LC_MESSAGES/djangojs.po
  35. BIN django/conf/locale/ko/LC_MESSAGES/django.mo
  36. +3,692 −2,109 django/conf/locale/ko/LC_MESSAGES/django.po
  37. BIN django/conf/locale/ko/LC_MESSAGES/djangojs.mo
  38. +20 −21 django/conf/locale/ko/LC_MESSAGES/djangojs.po
  39. BIN django/conf/locale/mk/LC_MESSAGES/django.mo
  40. +495 −269 django/conf/locale/mk/LC_MESSAGES/django.po
  41. BIN django/conf/locale/nl/LC_MESSAGES/django.mo
  42. +644 −276 django/conf/locale/nl/LC_MESSAGES/django.po
  43. BIN django/conf/locale/no/LC_MESSAGES/django.mo
  44. +149 −104 django/conf/locale/no/LC_MESSAGES/django.po
  45. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  46. +87 −85 django/conf/locale/pl/LC_MESSAGES/django.po
  47. BIN django/conf/locale/pt/LC_MESSAGES/django.mo
  48. +728 −332 django/conf/locale/pt/LC_MESSAGES/django.po
  49. BIN django/conf/locale/pt_BR/LC_MESSAGES/django.mo
  50. +160 −107 django/conf/locale/pt_BR/LC_MESSAGES/django.po
  51. BIN django/conf/locale/ru/LC_MESSAGES/django.mo
  52. +187 −140 django/conf/locale/ru/LC_MESSAGES/django.po
  53. BIN django/conf/locale/sr/LC_MESSAGES/django.mo
  54. +925 −1,021 django/conf/locale/sr/LC_MESSAGES/django.po
  55. BIN django/conf/locale/sr/LC_MESSAGES/djangojs.mo
  56. +18 −19 django/conf/locale/sr/LC_MESSAGES/djangojs.po
  57. BIN django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
  58. +4,436 −0 django/conf/locale/sr_Latn/LC_MESSAGES/django.po
  59. BIN django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
  60. +120 −0 django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
  61. BIN django/conf/locale/th/LC_MESSAGES/django.mo
  62. +208 −211 django/conf/locale/th/LC_MESSAGES/django.po
  63. BIN django/conf/locale/th/LC_MESSAGES/djangojs.mo
  64. +14 −13 django/conf/locale/th/LC_MESSAGES/djangojs.po
  65. BIN django/conf/locale/zh_CN/LC_MESSAGES/django.mo
  66. +102 −17 django/conf/locale/zh_CN/LC_MESSAGES/django.po
  67. BIN django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
  68. +2 −2 django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
  69. +13 −3 django/conf/urls/defaults.py
  70. +14 −10 django/contrib/admin/options.py
  71. +40 −30 django/contrib/admin/sites.py
  72. +24 −1 django/contrib/admin/templates/admin/base.html
  73. +9 −9 django/contrib/admin/widgets.py
  74. +1 −1 django/contrib/admindocs/templates/admin_doc/index.html
  75. +7 −4 django/contrib/admindocs/views.py
  76. +3 −0 django/contrib/gis/db/models/manager.py
  77. +21 −5 django/contrib/gis/db/models/query.py
  78. +9 −1 django/contrib/gis/db/models/sql/query.py
  79. +6 −3 django/contrib/gis/gdal/prototypes/generation.py
  80. +2 −0 django/contrib/gis/geos/prototypes/topology.py
  81. +26 −15 django/contrib/gis/tests/geoapp/tests.py
  82. +38 −9 django/contrib/gis/tests/relatedapp/tests.py
  83. +17 −2 django/contrib/gis/tests/test_spatialrefsys.py
  84. +2 −1 django/core/management/commands/dumpdata.py
  85. +1 −2 django/core/management/commands/runserver.py
  86. +26 −5 django/core/servers/basehttp.py
  87. +96 −21 django/core/urlresolvers.py
  88. +5 −5 django/db/backends/creation.py
  89. +10 −9 django/db/backends/oracle/base.py
  90. +9 −8 django/db/backends/postgresql/operations.py
  91. +24 −12 django/forms/models.py
  92. +16 −20 django/middleware/http.py
  93. +4 −3 django/template/context.py
  94. +13 −7 django/template/defaulttags.py
  95. +2 −2 django/views/debug.py
  96. +39 −14 docs/_ext/djangodocs.py
  97. +1 −1 docs/_templates/layout.html
  98. +9 −10 docs/faq/admin.txt
  99. +1 −1 docs/howto/custom-model-fields.txt
  100. +23 −2 docs/howto/deployment/modpython.txt
  101. +118 −69 docs/howto/deployment/modwsgi.txt
  102. +7 −3 docs/howto/error-reporting.txt
  103. +2 −1 docs/index.txt
  104. +36 −21 docs/internals/committers.txt
  105. +21 −0 docs/internals/deprecation.txt
  106. +2 −1 docs/internals/index.txt
  107. +16 −15 docs/internals/release-process.txt
  108. +3 −3 docs/intro/tutorial03.txt
  109. BIN docs/ref/contrib/admin/_images/article_actions.png
  110. +70 −44 docs/ref/contrib/admin/index.txt
  111. +2 −2 docs/ref/contrib/contenttypes.txt
  112. +1 −1 docs/ref/databases.txt
  113. +22 −21 docs/ref/forms/fields.txt
  114. +4 −11 docs/ref/middleware.txt
  115. +41 −1 docs/ref/models/instances.txt
  116. +1 −1 docs/ref/models/querysets.txt
  117. +12 −5 docs/ref/templates/api.txt
  118. +32 −5 docs/ref/templates/builtins.txt
  119. +111 −0 docs/releases/1.1-rc-1.txt
  120. +459 −0 docs/releases/1.1.txt
  121. +3 −1 docs/releases/index.txt
  122. +36 −13 docs/topics/forms/formsets.txt
  123. +193 −10 docs/topics/http/urls.txt
  124. +79 −10 docs/topics/i18n.txt
  125. +30 −7 docs/topics/testing.txt
  126. +2 −2 setup.py
View
@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Robert Wittams
* Gary Wilson
* Brian Rosner
+ * Justin Bronn
* Karen Tracey
More information on the main contributors to Django can be found in
@@ -131,6 +132,7 @@ answer newbie questions, and generally made Django that much better:
Andrew Durdin <adurdin@gmail.com>
dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
+ J. Clifford Dyer <jcd@unc.edu>
Clint Ecker
Nick Efford <nick@efford.org>
eibaan@gmail.com
@@ -199,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
Ian Holsman <http://feh.holsman.net/>
Kieran Holland <http://www.kieranholland.com>
Sung-Jin Hong <serialx.net@gmail.com>
+ Leo "hylje" Honkanen <sealage@gmail.com>
Richard House <Richard.House@i-logue.com>
Robert Rock Howard <http://djangomojo.com/>
John Huddleston <huddlej@wwu.edu>
@@ -217,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
Michael Josephson <http://www.sdjournal.com/>
jpellerin@gmail.com
junzhang.jn@gmail.com
- Antti Kaihola <http://akaihola.blogspot.com/>
+ Antti Kaihola <http://djangopeople.net/akaihola/>
Bahadır Kandemir <bahadir@pardus.org.tr>
Karderio <karderio@gmail.com>
Nagy Károly <charlie@rendszergazda.com>
@@ -436,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
viestards.lists@gmail.com
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
+ Zachary Voase <zacharyvoase@gmail.com>
Milton Waddams
Chris Wagner <cw264701@ohio.edu>
Rick Wagner <rwagner@physics.ucsd.edu>
View
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, 'beta', 1)
+VERSION = (1, 2, 0, 'alpha', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
@@ -7,9 +7,8 @@ def get_version():
if VERSION[3:] == ('alpha', 0):
version = '%s pre-alpha' % version
else:
- version = '%s %s' % (version, VERSION[3])
if VERSION[3] != 'final':
- version = '%s %s' % (version, VERSION[4])
+ version = '%s %s %s' % (version, VERSION[3], VERSION[4])
from django.utils.version import get_svn_revision
svn_rev = get_svn_revision()
if svn_rev != u'SVN-unknown':
Binary file not shown.
Oops, something went wrong. Retry.

0 comments on commit ba47aeb

Please sign in to comment.