Permalink
Browse files

gis: Merged revisions 7280-7353 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent b0a895f commit 2efc34dc5e65da792700af6594c537104cbee9dc @jbronn jbronn committed Mar 23, 2008
Showing with 2,256 additions and 1,123 deletions.
  1. +6 −0 AUTHORS
  2. +1 −1 django/conf/global_settings.py
  3. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  4. +557 −390 django/conf/locale/de/LC_MESSAGES/django.po
  5. +27 −27 django/contrib/admin/templates/admin_doc/index.html
  6. +42 −42 django/contrib/admin/templates/admin_doc/view_index.html
  7. +246 −246 django/contrib/formtools/wizard.py
  8. +3 −1 django/contrib/sessions/backends/file.py
  9. +14 −8 django/contrib/syndication/feeds.py
  10. +46 −38 django/core/mail.py
  11. +1 −1 django/core/management/__init__.py
  12. +7 −2 django/core/management/commands/startproject.py
  13. +145 −59 django/core/paginator.py
  14. +4 −6 django/core/serializers/base.py
  15. +12 −2 django/core/servers/fastcgi.py
  16. +10 −0 django/db/models/fields/__init__.py
  17. +7 −0 django/db/models/fields/related.py
  18. +9 −6 django/db/models/query.py
  19. +3 −0 django/http/__init__.py
  20. +23 −5 django/newforms/extras/widgets.py
  21. +29 −1 django/newforms/fields.py
  22. +27 −16 django/newforms/models.py
  23. +4 −1 django/template/defaultfilters.py
  24. +3 −2 django/test/client.py
  25. +4 −2 django/utils/daemonize.py
  26. +14 −3 django/views/debug.py
  27. +27 −23 django/views/generic/list_detail.py
  28. +2 −2 docs/custom_model_fields.txt
  29. +2 −2 docs/db-api.txt
  30. +15 −2 docs/generic_views.txt
  31. +14 −0 docs/install.txt
  32. +11 −9 docs/model-api.txt
  33. +10 −0 docs/modelforms.txt
  34. +75 −7 docs/newforms.txt
  35. +133 −0 docs/pagination.txt
  36. +27 −0 docs/request_response.txt
  37. +4 −4 docs/sessions.txt
  38. +8 −3 docs/settings.txt
  39. +7 −0 docs/syndication_feeds.txt
  40. +86 −78 docs/templates.txt
  41. +6 −0 docs/tutorial04.txt
  42. +5 −3 docs/url_dispatch.txt
  43. +3 −2 tests/modeltests/custom_pk/models.py
  44. +5 −2 tests/modeltests/lookup/models.py
  45. +18 −10 tests/modeltests/manipulators/models.py
  46. +53 −20 tests/modeltests/model_forms/models.py
  47. +172 −27 tests/modeltests/pagination/models.py
  48. +14 −10 tests/modeltests/validation/models.py
  49. +75 −8 tests/regressiontests/forms/extra.py
  50. +27 −0 tests/regressiontests/forms/fields.py
  51. +111 −48 tests/regressiontests/forms/forms.py
  52. +24 −0 tests/regressiontests/model_fields/models.py
  53. 0 tests/regressiontests/syndication/__init__.py
  54. 0 tests/regressiontests/syndication/models.py
  55. +14 −0 tests/regressiontests/syndication/tests.py
  56. +18 −0 tests/regressiontests/syndication/urls.py
  57. +29 −1 tests/regressiontests/test_client_regress/models.py
  58. +1 −0 tests/regressiontests/test_client_regress/urls.py
  59. +13 −3 tests/regressiontests/test_client_regress/views.py
  60. +3 −0 tests/urls.py
View
@@ -59,6 +59,7 @@ answer newbie questions, and generally made Django that much better:
Arthur <avandorp@gmail.com>
David Avsajanishvili <avsd05@gmail.com>
axiak@mit.edu
+ Niran Babalola <niran@niran.org>
Morten Bagai <m@bagai.com>
Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
Jiri Barton
@@ -145,6 +146,7 @@ answer newbie questions, and generally made Django that much better:
Jorge Gajon <gajon@gajon.org>
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
+ Alex Gaynor <alex.gaynor@gmail.com>
Andy Gayton <andy-django@thecablelounge.com>
Baishampayan Ghose
Dimitris Glezos <dimitris@glezos.com>
@@ -243,6 +245,7 @@ answer newbie questions, and generally made Django that much better:
michael.mcewan@gmail.com
michal@plovarna.cz
Mikko Hellsing <mikko@sorl.net>
+ Daniel Lindsley <polarcowz@gmail.com>
Orestis Markou <orestis@orestis.gr>
Slawek Mikula <slawek dot mikula at gmail dot com>
mitakummaa@gmail.com
@@ -256,6 +259,7 @@ answer newbie questions, and generally made Django that much better:
Robin Munn <http://www.geekforgod.com/>
Robert Myers <myer0052@gmail.com>
Nebojša Dorđević
+ Doug Napoleone <doug@dougma.com>
Gopal Narayanan <gopastro@gmail.com>
Fraser Nevett <mail@nevett.org>
Sam Newman <http://www.magpiebrain.com/>
@@ -269,6 +273,7 @@ answer newbie questions, and generally made Django that much better:
Barry Pederson <bp@barryp.org>
permonik@mesias.brnonet.cz
petr.marhoun@gmail.com
+ peter@mymart.com
pgross@thoughtworks.com
phaedo <http://phaedo.cx/>
phil@produxion.net
@@ -307,6 +312,7 @@ answer newbie questions, and generally made Django that much better:
serbaut@gmail.com
John Shaffer <jshaffer2112@gmail.com>
Pete Shinners <pete@shinners.org>
+ Leo Shklovskii
jason.sidabras@gmail.com
Jozko Skrablin <jozko.skrablin@gmail.com>
Ben Slavin <benjamin.slavin@gmail.com>
@@ -287,7 +287,7 @@
SESSION_SAVE_EVERY_REQUEST = False # Whether to save the session data on every request.
SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Whether sessions expire when a user closes his browser.
SESSION_ENGINE = 'django.contrib.sessions.backends.db' # The module to store session data
-SESSION_FILE_PATH = '/tmp/' # Directory to store session files if using the file session module
+SESSION_FILE_PATH = None # Directory to store session files if using the file session module. If set to None the backend will use a sensible default.
#########
# CACHE #
Binary file not shown.
Oops, something went wrong.

0 comments on commit 2efc34d

Please sign in to comment.