Permalink
Browse files

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-80…

…39,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 45b73c9 commit aa239e3e5405933af6a29dac3cf587b59a099927 @jbronn jbronn committed Aug 5, 2008
Showing with 20,937 additions and 13,781 deletions.
  1. +12 −1 AUTHORS
  2. +1 −1 django/__init__.py
  3. +6 −0 django/conf/global_settings.py
  4. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  5. +699 −544 django/conf/locale/de/LC_MESSAGES/django.po
  6. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  7. +883 −967 django/conf/locale/es/LC_MESSAGES/django.po
  8. BIN django/conf/locale/es_AR/LC_MESSAGES/django.mo
  9. +721 −651 django/conf/locale/es_AR/LC_MESSAGES/django.po
  10. BIN django/conf/locale/fr/LC_MESSAGES/django.mo
  11. +35 −35 django/conf/locale/fr/LC_MESSAGES/django.po
  12. BIN django/conf/locale/it/LC_MESSAGES/django.mo
  13. +651 −528 django/conf/locale/it/LC_MESSAGES/django.po
  14. BIN django/conf/locale/ka/LC_MESSAGES/django.mo
  15. +180 −166 django/conf/locale/ka/LC_MESSAGES/django.po
  16. BIN django/conf/locale/nl/LC_MESSAGES/django.mo
  17. +1,472 −1,230 django/conf/locale/nl/LC_MESSAGES/django.po
  18. BIN django/conf/locale/no/LC_MESSAGES/django.mo
  19. +1,739 −1,731 django/conf/locale/no/LC_MESSAGES/django.po
  20. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  21. +601 −497 django/conf/locale/pl/LC_MESSAGES/django.po
  22. BIN django/conf/locale/pt_BR/LC_MESSAGES/django.mo
  23. +1 −1 django/conf/locale/pt_BR/LC_MESSAGES/django.po
  24. BIN django/conf/locale/sr/LC_MESSAGES/django.mo
  25. +3,883 −1,295 django/conf/locale/sr/LC_MESSAGES/django.po
  26. BIN django/conf/locale/sr/LC_MESSAGES/djangojs.mo
  27. +35 −24 django/conf/locale/sr/LC_MESSAGES/djangojs.po
  28. BIN django/conf/locale/sv/LC_MESSAGES/django.mo
  29. +700 −580 django/conf/locale/sv/LC_MESSAGES/django.po
  30. +7 −6 django/conf/project_template/urls.py
  31. +5 −2 django/contrib/admin/__init__.py
  32. +3 −0 django/contrib/admin/media/css/rtl.css
  33. +59 −40 django/contrib/admin/options.py
  34. +38 −30 django/contrib/admin/sites.py
  35. +2 −2 django/contrib/admin/templates/admin/includes/fieldset.html
  36. +1 −1 django/contrib/admin/templates/admin_doc/model_detail.html
  37. +16 −0 django/contrib/admin/templates/registration/password_reset_complete.html
  38. +32 −0 django/contrib/admin/templates/registration/password_reset_confirm.html
  39. +1 −1 django/contrib/admin/templates/registration/password_reset_done.html
  40. +7 −7 django/contrib/admin/templates/registration/password_reset_email.html
  41. +1 −1 django/contrib/admin/templates/registration/password_reset_form.html
  42. +10 −1 django/contrib/admin/validation.py
  43. +4 −4 django/contrib/admin/views/decorators.py
  44. +0 −1 django/contrib/admin/views/main.py
  45. +1 −2 django/contrib/admin/widgets.py
  46. +1 −1 django/contrib/admindocs/views.py
  47. +1 −1 django/contrib/auth/admin.py
  48. +2 −2 django/contrib/auth/decorators.py
  49. +56 −47 django/contrib/auth/forms.py
  50. +1 −1 django/contrib/auth/management/commands/createsuperuser.py
  51. +3 −0 django/contrib/auth/models.py
  52. +4 −1 django/contrib/auth/tests/__init__.py
  53. +0 −21 django/contrib/auth/tests/basic.py
  54. +32 −1 django/contrib/auth/tests/forms.py
  55. +29 −0 django/contrib/auth/tests/tokens.py
  56. +88 −0 django/contrib/auth/tests/views.py
  57. +66 −0 django/contrib/auth/tokens.py
  58. +7 −4 django/contrib/auth/urls.py
  59. +55 −9 django/contrib/auth/views.py
  60. +2 −2 django/contrib/comments/models.py
  61. +4 −1 django/contrib/contenttypes/generic.py
  62. +27 −26 django/contrib/csrf/middleware.py
  63. +0 −1 django/contrib/databrowse/plugins/calendars.py
  64. +0 −1 django/contrib/databrowse/plugins/fieldchoices.py
  65. +1 −1 django/contrib/databrowse/sites.py
  66. +0 −2 django/contrib/databrowse/views.py
  67. +4 −3 django/contrib/formtools/preview.py
  68. +0 −1 django/contrib/formtools/tests.py
  69. +4 −3 django/contrib/formtools/wizard.py
  70. +1 −1 django/contrib/gis/db/backend/oracle/field.py
  71. +1 −1 django/contrib/gis/db/backend/postgis/field.py
  72. +5 −0 django/contrib/gis/db/models/manager.py
  73. 0 {tests/regressiontests/maxlength → django/contrib/localflavor/at}/__init__.py
  74. +14 −0 django/contrib/localflavor/at/at_states.py
  75. +65 −0 django/contrib/localflavor/at/forms.py
  76. 0 tests/regressiontests/maxlength/models.py → django/contrib/localflavor/ro/__init__.py
  77. +200 −0 django/contrib/localflavor/ro/forms.py
  78. +52 −0 django/contrib/localflavor/ro/ro_counties.py
  79. +11 −0 django/contrib/redirects/admin.py
  80. +0 −15 django/contrib/redirects/models.py
  81. +5 −5 django/contrib/sessions/backends/base.py
  82. +0 −2 django/contrib/sessions/backends/cache.py
  83. +0 −3 django/contrib/sessions/backends/db.py
  84. +0 −5 django/contrib/sessions/middleware.py
  85. +3 −3 django/contrib/sessions/models.py
  86. +13 −3 django/contrib/sitemaps/__init__.py
  87. 0 django/contrib/sitemaps/management/__init__.py
  88. 0 django/contrib/sitemaps/management/commands/__init__.py
  89. +19 −5 django/contrib/sitemaps/views.py
  90. +4 −1 django/contrib/sites/tests.py
  91. +1 −1 django/contrib/syndication/feeds.py
  92. +8 −15 django/core/cache/__init__.py
  93. +8 −1 django/core/cache/backends/base.py
  94. +15 −14 django/core/cache/backends/filebased.py
  95. +1 −1 django/core/cache/backends/locmem.py
  96. +58 −0 django/core/files/temp.py
  97. +2 −1 django/core/files/uploadedfile.py
  98. +1 −2 django/core/files/uploadhandler.py
  99. +35 −6 django/core/handlers/base.py
  100. +23 −2 django/core/handlers/modpython.py
  101. +16 −3 django/core/handlers/wsgi.py
  102. +4 −3 django/core/mail.py
  103. +1 −2 django/core/management/commands/compilemessages.py
  104. +0 −1 django/core/management/commands/test.py
  105. +0 −1 django/core/management/commands/testserver.py
  106. +6 −6 django/core/management/sql.py
  107. +44 −1 django/core/management/validation.py
  108. +14 −84 django/core/paginator.py
  109. +2 −4 django/core/serializers/base.py
  110. +4 −5 django/core/serializers/json.py
  111. +3 −5 django/core/serializers/pyyaml.py
  112. +30 −3 django/core/urlresolvers.py
  113. +66 −4 django/db/backends/__init__.py
  114. +18 −1 django/db/backends/mysql/base.py
  115. +22 −8 django/db/backends/oracle/base.py
  116. +5 −4 django/db/backends/oracle/query.py
  117. +7 −1 django/db/backends/sqlite3/base.py
  118. +10 −2 django/db/backends/util.py
  119. +0 −2 django/db/models/__init__.py
  120. +23 −15 django/db/models/base.py
  121. +129 −115 django/db/models/fields/__init__.py
  122. +125 −48 django/db/models/fields/related.py
  123. +1 −4 django/db/models/fields/subclassing.py
  124. +14 −21 django/db/models/query.py
  125. +21 −13 django/db/models/sql/query.py
  126. +30 −9 django/db/models/sql/where.py
  127. +16 −16 django/dispatch/dispatcher.py
  128. +0 −1 django/dispatch/saferef.py
  129. +14 −2 django/forms/fields.py
  130. +7 −11 django/forms/formsets.py
  131. +19 −11 django/forms/models.py
  132. +0 −1 django/forms/util.py
  133. +2 −11 django/http/__init__.py
  134. +2 −13 django/http/multipartparser.py
  135. +3 −3 django/middleware/common.py
  136. +0 −4 django/oldforms/__init__.py
  137. +2 −0 django/template/context.py
  138. +19 −16 django/template/defaulttags.py
  139. +1 −1 django/test/client.py
  140. +132 −12 django/test/testcases.py
  141. +3 −3 django/utils/cache.py
  142. +1 −1 django/utils/dateformat.py
  143. +0 −2 django/utils/encoding.py
  144. +36 −24 django/utils/functional.py
  145. +16 −0 django/utils/hashcompat.py
  146. +4 −2 django/utils/html.py
  147. +29 −0 django/utils/http.py
  148. +0 −65 django/utils/maxlength.py
  149. +0 −1 django/utils/simplejson/LICENSE.txt
  150. +155 −31 django/utils/simplejson/__init__.py
  151. +87 −17 django/utils/simplejson/decoder.py
  152. +70 −16 django/utils/simplejson/encoder.py
  153. +0 −40 django/utils/simplejson/jsonfilter.py
  154. +11 −7 django/utils/simplejson/scanner.py
  155. +44 −0 django/utils/simplejson/tool.py
  156. +12 −0 django/utils/thread_support.py
  157. +1 −12 django/utils/translation/trans_real.py
  158. +0 −2 django/views/debug.py
  159. +4 −4 django/views/generic/create_update.py
  160. +0 −1 django/views/generic/simple.py
  161. +3 −2 docs/add_ons.txt
  162. +178 −43 docs/admin.txt
  163. +2 −3 docs/api_stability.txt
  164. +5 −5 docs/authentication.txt
  165. +23 −15 docs/cache.txt
  166. +4 −4 docs/contenttypes.txt
  167. +0 −1 docs/contributing.txt
  168. +6 −6 docs/csrf.txt
  169. +38 −21 docs/custom_model_fields.txt
  170. +2 −2 docs/databases.txt
  171. +34 −2 docs/db-api.txt
  172. +1 −1 docs/django-admin.txt
  173. +1 −1 docs/email.txt
  174. +4 −13 docs/faq.txt
  175. +33 −3 docs/fastcgi.txt
  176. +7 −7 docs/form_for_model.txt
  177. +2 −2 docs/form_preview.txt
  178. +8 −8 docs/form_wizard.txt
  179. +2,374 −602 docs/forms.txt
  180. +699 −576 docs/generic_views.txt
  181. +34 −1 docs/i18n.txt
  182. +1 −1 docs/index.txt
  183. +2 −2 docs/install.txt
  184. +73 −5 docs/localflavor.txt
  185. +1 −1 docs/middleware.txt
  186. +155 −11 docs/model-api.txt
  187. +13 −13 docs/modelforms.txt
  188. +20 −0 docs/modpython.txt
  189. +0 −2,522 docs/newforms.txt
  190. +696 −0 docs/oldforms.txt
  191. +3 −3 docs/overview.txt
  192. +80 −41 docs/pagination.txt
  193. +2 −2 docs/release_notes_0.95.txt
  194. +163 −0 docs/release_notes_1.0_alpha.txt
  195. +0 −12 docs/request_response.txt
  196. +9 −15 docs/serialization.txt
  197. +4 −4 docs/sessions.txt
  198. +13 −3 docs/settings.txt
  199. +4 −0 docs/sitemaps.txt
  200. +21 −8 docs/templates.txt
  201. +4 −11 docs/testing.txt
  202. +27 −3 docs/tutorial02.txt
  203. +2 −2 docs/tutorial03.txt
  204. +6 −6 docs/upload_handling.txt
  205. +2 −2 docs/url_dispatch.txt
  206. +20 −0 setup.py
  207. +11 −0 tests/modeltests/choices/models.py
  208. +2 −1 tests/modeltests/custom_methods/models.py
  209. +21 −10 tests/modeltests/delete/models.py
  210. +55 −0 tests/modeltests/generic_relations/models.py
  211. +65 −0 tests/modeltests/invalid_models/models.py
  212. +2 −0 tests/modeltests/m2m_through/__init__.py
  213. +337 −0 tests/modeltests/m2m_through/models.py
  214. +6 −2 tests/modeltests/many_to_one/models.py
  215. +4 −2 tests/modeltests/model_forms/models.py
  216. +40 −16 tests/modeltests/model_formsets/models.py
  217. +17 −90 tests/modeltests/pagination/models.py
  218. +21 −1 tests/modeltests/validation/models.py
  219. 0 tests/regressiontests/admin_registration/__init__.py
  220. +64 −0 tests/regressiontests/admin_registration/models.py
  221. +104 −77 tests/regressiontests/admin_scripts/tests.py
  222. +4 −4 tests/regressiontests/admin_views/tests.py
  223. +7 −1 tests/regressiontests/auth_backends/tests.py
  224. +17 −16 tests/regressiontests/cache/tests.py
  225. 0 tests/regressiontests/context_processors/__init__.py
  226. +1 −0 tests/regressiontests/context_processors/models.py
  227. +13 −0 tests/regressiontests/context_processors/templates/context_processors/request_attrs.html
  228. +38 −0 tests/regressiontests/context_processors/tests.py
  229. +8 −0 tests/regressiontests/context_processors/urls.py
  230. +8 −0 tests/regressiontests/context_processors/views.py
  231. +17 −1 tests/regressiontests/dispatch/tests/test_dispatcher.py
  232. +9 −2 tests/regressiontests/file_uploads/models.py
  233. +61 −15 tests/regressiontests/file_uploads/tests.py
  234. +59 −47 tests/regressiontests/forms/fields.py
  235. +4 −0 tests/regressiontests/forms/forms.py
  236. +1 −15 tests/regressiontests/forms/formsets.py
  237. +80 −0 tests/regressiontests/forms/localflavor/at.py
  238. +175 −0 tests/regressiontests/forms/localflavor/ro.py
  239. +19 −0 tests/regressiontests/forms/models.py
  240. +4 −0 tests/regressiontests/forms/tests.py
  241. +2 −0 tests/regressiontests/m2m_through_regress/__init__.py
  242. +204 −0 tests/regressiontests/m2m_through_regress/models.py
  243. +8 −1 tests/regressiontests/mail/tests.py
  244. +45 −7 tests/regressiontests/many_to_one_regress/models.py
  245. +1 −1 tests/regressiontests/max_lengths/tests.py
  246. +0 −160 tests/regressiontests/maxlength/tests.py
  247. +59 −1 tests/regressiontests/model_fields/models.py
  248. +26 −12 tests/regressiontests/model_fields/tests.py
  249. +35 −0 tests/regressiontests/model_inheritance_regress/models.py
  250. +19 −0 tests/regressiontests/model_regress/models.py
  251. +14 −0 tests/regressiontests/modeladmin/models.py
  252. +9 −9 tests/regressiontests/null_fk/models.py
  253. +33 −2 tests/regressiontests/one_to_one_regress/models.py
  254. 0 tests/regressiontests/pagination_regress/__init__.py
  255. +1 −0 tests/regressiontests/pagination_regress/models.py
  256. +157 −0 tests/regressiontests/pagination_regress/tests.py
  257. +67 −2 tests/regressiontests/queries/models.py
  258. +3 −2 tests/regressiontests/requests/tests.py
  259. 0 tests/regressiontests/reverse_single_related/__init__.py
  260. +54 −0 tests/regressiontests/reverse_single_related/models.py
  261. +20 −16 tests/regressiontests/serializers_regress/tests.py
  262. +3 −2 tests/regressiontests/templates/loaders.py
  263. +17 −8 tests/regressiontests/templates/tests.py
  264. +5 −7 tests/regressiontests/test_client_regress/models.py
  265. 0 tests/regressiontests/test_utils/__init__.py
  266. 0 tests/regressiontests/test_utils/models.py
  267. +72 −0 tests/regressiontests/test_utils/tests.py
  268. +0 −6 tests/regressiontests/utils/datastructures.py
  269. +7 −0 tests/regressiontests/utils/tests.py
View
13 AUTHORS
@@ -41,6 +41,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
+ ajs <adi@sieker.info>
alang@bright-green.com
Marty Alchin <gulopine@gamemusic.org>
atlithorn <atlithorn@gmail.com>
@@ -70,7 +71,7 @@ answer newbie questions, and generally made Django that much better:
Esdras Beleza <linux@esdrasbeleza.com>
Chris Bennett <chrisrbennett@yahoo.com>
James Bennett
- Ben Godfrey <http://aftnn.org>
+ Julian Bez
Arvis Bickovskis <viestards.lists@gmail.com>
Paul Bissex <http://e-scribe.com/>
Simon Blanchard
@@ -150,8 +151,10 @@ answer newbie questions, and generally made Django that much better:
Stefane Fermgier <sf@fermigier.com>
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
J. Pablo Fernandez <pupeno@pupeno.com>
+ Maciej Fijalkowski
Matthew Flanagan <http://wadofstuff.blogspot.com>
Eric Floehr <eric@intellovations.com>
+ Eric Florenzano <floguy@gmail.com>
Vincent Foley <vfoleybourgon@yahoo.ca>
Rudolph Froger <rfroger@estrate.nl>
Jorge Gajon <gajon@gajon.org>
@@ -164,6 +167,7 @@ answer newbie questions, and generally made Django that much better:
glin@seznam.cz
martin.glueck@gmail.com
Artyom Gnilov <boobsd@gmail.com>
+ Ben Godfrey <http://aftnn.org>
GomoX <gomo@datafull.com>
Guilherme Mesquita Gondim <semente@taurinus.org>
Mario Gonzalez <gonzalemario@gmail.com>
@@ -172,6 +176,7 @@ answer newbie questions, and generally made Django that much better:
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
Thomas Güttler <hv@tbz-pariv.de>
+ Horst Gutmann <zerok@zerokspot.com>
dAniel hAhler
hambaloney
Brian Harring <ferringb@gmail.com>
@@ -234,6 +239,7 @@ answer newbie questions, and generally made Django that much better:
Stuart Langridge <http://www.kryogenix.org/>
Paul Lanier <planier@google.com>
Nicola Larosa <nico@teknico.net>
+ Lau Bech Lauritzen
Rune Rønde Laursen <runerl@skjoldhoej.dk>
Eugene Lazutkin <http://lazutkin.com/blog/>
lcordier@point45.com
@@ -276,6 +282,7 @@ answer newbie questions, and generally made Django that much better:
Eric Moritz <http://eric.themoritzfamily.com/>
mrmachine <real.human@mrmachine.net>
Robin Munn <http://www.geekforgod.com/>
+ James Murty
msundstr
Robert Myers <myer0052@gmail.com>
Nebojša Dorđević
@@ -301,6 +308,7 @@ answer newbie questions, and generally made Django that much better:
phil@produxion.net
phil.h.smith@gmail.com
Gustavo Picon
+ Michael Placentra II <someone@michaelplacentra2.net>
Luke Plant <http://lukeplant.me.uk/>
plisk
Mihai Preda <mihai_preda@yahoo.com>
@@ -338,8 +346,10 @@ answer newbie questions, and generally made Django that much better:
Pete Shinners <pete@shinners.org>
Leo Shklovskii
jason.sidabras@gmail.com
+ Brenton Simpson <http://theillustratedlife.com>
Jozko Skrablin <jozko.skrablin@gmail.com>
Ben Slavin <benjamin.slavin@gmail.com>
+ sloonz <simon.lipp@insa-lyon.fr>
SmileyChris <smileychris@gmail.com>
smurf@smurf.noris.de
Vsevolod Solovyov
@@ -398,6 +408,7 @@ answer newbie questions, and generally made Django that much better:
charly.wilhelm@gmail.com
Rachel Willmer <http://www.willmer.com/kb/>
Gary Wilson <gary.wilson@gmail.com>
+ Jakub Wilk <ubanus@users.sf.net>
Jakub Wiśniowski <restless.being@gmail.com>
Maciej Wiśniowski <pigletto@gmail.com>
wojtek
View
@@ -1,4 +1,4 @@
-VERSION = (0, 97, 'pre')
+VERSION = (1, 0, 'alpha')
def get_version():
"Returns the version as a human-format string."
@@ -188,6 +188,9 @@
# Whether to prepend the "www." subdomain to URLs that don't have it.
PREPEND_WWW = False
+# Override the server-derived value of SCRIPT_NAME
+FORCE_SCRIPT_NAME = None
+
# List of compiled regular expression objects representing User-Agent strings
# that are not allowed to visit any page, systemwide. Use this for bad
# robots/crawlers. Here are a few examples:
@@ -363,6 +366,9 @@
LOGIN_REDIRECT_URL = '/accounts/profile/'
+# The number of days a password reset link is valid for
+PASSWORD_RESET_TIMEOUT_DAYS = 3
+
###########
# TESTING #
###########
Binary file not shown.
Oops, something went wrong.

0 comments on commit aa239e3

Please sign in to comment.