Permalink
Browse files

gis: Merged revisions 7574-7583,7585-7586,7590-7602,7614-7615,7619-76…

…25,7629,7632-7636 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 4ec80c4 commit 842dae0ed59cc7566cf35090093222ea3a61ec79 @jbronn jbronn committed Jun 16, 2008
Showing with 1,563 additions and 441 deletions.
  1. +5 −1 AUTHORS
  2. +5 −4 django/conf/global_settings.py
  3. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  4. +173 −186 django/conf/locale/es/LC_MESSAGES/django.po
  5. +4 −90 django/contrib/auth/create_superuser.py
  6. +6 −4 django/contrib/auth/{management.py → management/__init__.py}
  7. 0 django/contrib/auth/management/commands/__init__.py
  8. +123 −0 django/contrib/auth/management/commands/createsuperuser.py
  9. +7 −0 django/contrib/auth/models.py
  10. +17 −0 django/contrib/auth/tests.py
  11. +57 −0 django/contrib/sessions/backends/base.py
  12. +4 −4 django/contrib/sessions/backends/cache.py
  13. +1 −1 django/contrib/sessions/backends/db.py
  14. +4 −4 django/contrib/sessions/middleware.py
  15. +94 −0 django/contrib/sessions/tests.py
  16. +8 −3 django/core/management/commands/dumpdata.py
  17. +28 −7 django/core/management/commands/loaddata.py
  18. +10 −1 django/core/management/commands/syncdb.py
  19. +1 −1 django/core/management/sql.py
  20. +1 −1 django/core/serializers/base.py
  21. +2 −2 django/db/backends/__init__.py
  22. +9 −4 django/db/models/base.py
  23. +36 −11 django/db/models/fields/related.py
  24. +7 −3 django/db/models/options.py
  25. +7 −1 django/db/models/query.py
  26. +12 −4 django/db/models/sql/query.py
  27. +2 −3 django/db/models/sql/subqueries.py
  28. +1 −1 django/db/models/sql/where.py
  29. +4 −4 django/template/__init__.py
  30. +10 −4 django/test/client.py
  31. +12 −0 django/test/testcases.py
  32. +13 −9 django/utils/text.py
  33. +16 −5 docs/authentication.txt
  34. +83 −21 docs/contributing.txt
  35. +42 −6 docs/db-api.txt
  36. +53 −12 docs/django-admin.txt
  37. +89 −6 docs/faq.txt
  38. +3 −0 docs/outputting_pdf.txt
  39. +35 −0 docs/serialization.txt
  40. +59 −1 docs/sessions.txt
  41. +2 −0 docs/settings.txt
  42. +10 −6 docs/testing.txt
  43. +3 −2 tests/modeltests/basic/models.py
  44. +8 −0 tests/modeltests/many_to_many/models.py
  45. +6 −0 tests/modeltests/many_to_one/models.py
  46. +5 −0 tests/modeltests/model_inheritance/models.py
  47. +1 −4 tests/modeltests/one_to_one/models.py
  48. +3 −2 tests/modeltests/or_lookups/models.py
  49. +18 −0 tests/modeltests/test_client/fixtures/testdata.json
  50. +7 −0 tests/modeltests/update/models.py
  51. +11 −9 tests/regressiontests/defaultfilters/tests.py
  52. +1 −0 tests/regressiontests/fixtures_regress/fixtures/bad_fixture1.unkn
  53. +7 −0 tests/regressiontests/fixtures_regress/fixtures/bad_fixture2.xml
  54. +23 −0 tests/regressiontests/fixtures_regress/models.py
  55. +44 −2 tests/regressiontests/many_to_one_regress/models.py
  56. 0 tests/regressiontests/model_inheritance_regress/__init__.py
  57. +120 −0 tests/regressiontests/model_inheritance_regress/models.py
  58. 0 tests/regressiontests/null_fk/__init__.py
  59. +55 −0 tests/regressiontests/null_fk/models.py
  60. +38 −0 tests/regressiontests/one_to_one_regress/models.py
  61. +9 −2 tests/regressiontests/queries/models.py
  62. +20 −0 tests/regressiontests/serializers_regress/models.py
  63. +42 −8 tests/regressiontests/serializers_regress/tests.py
  64. +36 −0 tests/regressiontests/test_client_regress/fixtures/testdata.json
  65. +29 −0 tests/regressiontests/test_client_regress/models.py
  66. +1 −0 tests/regressiontests/test_client_regress/urls.py
  67. +14 −0 tests/regressiontests/test_client_regress/views.py
  68. +7 −2 tests/runtests.py
View
@@ -57,6 +57,7 @@ answer newbie questions, and generally made Django that much better:
David Ascher <http://ascher.ca/>
Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
Arthur <avandorp@gmail.com>
+ av0000@mail.ru
David Avsajanishvili <avsd05@gmail.com>
axiak@mit.edu
Niran Babalola <niran@niran.org>
@@ -78,6 +79,7 @@ answer newbie questions, and generally made Django that much better:
brut.alll@gmail.com
btoll@bestweb.net
Jonathan Buchanan <jonathan.buchanan@gmail.com>
+ Keith Bussell <kbussell@gmail.com>
Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
Trevor Caira <trevor@caira.com>
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
@@ -142,6 +144,7 @@ answer newbie questions, and generally made Django that much better:
Bill Fenner <fenner@gmail.com>
Stefane Fermgier <sf@fermigier.com>
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
+ J. Pablo Fernandez <pupeno@pupeno.com>
Matthew Flanagan <http://wadofstuff.blogspot.com>
Eric Floehr <eric@intellovations.com>
Vincent Foley <vfoleybourgon@yahoo.ca>
@@ -359,13 +362,14 @@ answer newbie questions, and generally made Django that much better:
Makoto Tsuyuki <mtsuyuki@gmail.com>
tt@gurgle.no
David Tulig <david.tulig@gmail.com>
- Amit Upadhyay
+ Amit Upadhyay <http://www.amitu.com/blog/>
Geert Vanderkelen
I.S. van Oostveen <v.oostveen@idca.nl>
viestards.lists@gmail.com
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
Milton Waddams
+ Chris Wagner <cw264701@ohio.edu>
wam-djangobug@wamber.net
Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com>
@@ -11,9 +11,10 @@
DEBUG = False
TEMPLATE_DEBUG = False
-# True if BaseHandler.get_response() should propagate raw exceptions
-# rather than catching them. This is useful under some testing siutations,
-# and should never be used on a live site.
+
+# Whether the framework should propagate raw exceptions rather than catching
+# them. This is useful under some testing siutations and should never be used
+# on a live site.
DEBUG_PROPAGATE_EXCEPTIONS = False
# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
@@ -289,7 +290,7 @@
SESSION_COOKIE_SECURE = False # Whether the session cookie should be secure (https:// only).
SESSION_COOKIE_PATH = '/' # The path of the session cookie.
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_EXPIRE_AT_BROWSER_CLOSE = False # Whether a user's session cookie expires when the Web browser is closed.
SESSION_ENGINE = 'django.contrib.sessions.backends.db' # The module to store session data
SESSION_FILE_PATH = None # Directory to store session files if using the file session module. If None, the backend will use a sensible default.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 842dae0

Please sign in to comment.