[Python-modules-commits] [python-django] 02/04: Merge tag 'upstream/1.7' into debian/experimental

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/experimental
in repository python-django.

commit 8154bd219c7335e69be2a996286ecd50acd96f8a
Merge: bce5891 2a5c21f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Sep 8 10:18:49 2014 +0200

    Merge tag 'upstream/1.7' into debian/experimental
    
    Upstream version 1.7

 AUTHORS                                            |   1 +
 Django.egg-info/PKG-INFO                           |   2 +-
 Django.egg-info/SOURCES.txt                        |   3 +
 PKG-INFO                                           |   2 +-
 django/__init__.py                                 |   2 +-
 django/conf/global_settings.py                     |   3 +
 django/conf/locale/__init__.py                     |  18 +++
 django/conf/locale/en/LC_MESSAGES/django.po        |  14 +-
 django/contrib/admin/options.py                    |  10 +-
 .../contrib/admin/templates/admin/change_form.html |   2 +-
 .../contrib/admin/templates/admin/change_list.html |   2 +-
 django/contrib/admin/tests.py                      |   4 +-
 django/contrib/staticfiles/testing.py              |   2 +-
 django/core/management/sql.py                      |   2 +-
 django/db/backends/oracle/base.py                  |  23 ++-
 django/db/backends/oracle/creation.py              |   2 +
 django/db/migrations/graph.py                      |   6 +-
 django/db/migrations/loader.py                     |   6 +-
 django/db/migrations/operations/special.py         |   4 +-
 django/db/models/query.py                          |   6 +-
 django/utils/translation/__init__.py               |   2 +-
 docs/howto/custom-file-storage.txt                 |   2 +-
 docs/howto/static-files/index.txt                  |   6 +-
 .../contributing/writing-code/unit-tests.txt       |   2 +-
 docs/internals/howto-release-django.txt            |   3 +-
 docs/intro/tutorial01.txt                          |   2 +-
 docs/ref/class-based-views/generic-date-based.txt  |   2 +-
 docs/ref/class-based-views/index.txt               |   6 +-
 docs/ref/contrib/admin/index.txt                   |   1 +
 docs/ref/contrib/sites.txt                         |   8 +-
 docs/ref/contrib/staticfiles.txt                   |   6 +-
 docs/ref/databases.txt                             |   9 ++
 docs/ref/django-admin.txt                          |   3 +
 docs/ref/files/storage.txt                         |   2 +-
 docs/ref/forms/fields.txt                          |  17 ++-
 docs/ref/forms/validation.txt                      |   2 +-
 docs/ref/forms/widgets.txt                         |   7 +-
 docs/ref/models/fields.txt                         |   2 +-
 docs/ref/settings.txt                              |  19 ++-
 docs/ref/signals.txt                               |   6 +-
 docs/ref/templates/api.txt                         |  25 ++++
 docs/releases/1.4.14.txt                           |   2 +-
 docs/releases/1.4.15.txt                           |  13 ++
 docs/releases/1.5.10.txt                           |  13 ++
 docs/releases/1.5.9.txt                            |   2 +-
 docs/releases/1.6.6.txt                            |   2 +-
 docs/releases/1.6.7.txt                            |  16 ++
 docs/releases/1.7.txt                              |  37 +++--
 docs/releases/index.txt                            |   3 +
 docs/releases/security.txt                         | 120 +++++++++++++--
 docs/topics/auth/index.txt                         |   5 +-
 docs/topics/class-based-views/generic-display.txt  |   6 +-
 docs/topics/db/multi-db.txt                        |  24 ++-
 docs/topics/forms/index.txt                        |  10 ++
 docs/topics/http/file-uploads.txt                  |  49 +-----
 docs/topics/http/urls.txt                          | 164 +++++++++++++--------
 docs/topics/i18n/timezones.txt                     |   3 +-
 docs/topics/i18n/translation.txt                   |   7 +-
 docs/topics/migrations.txt                         |  19 ++-
 docs/topics/testing/tools.txt                      |   6 +-
 tests/admin_views/admin.py                         |   6 +-
 tests/admin_views/models.py                        |  17 +++
 tests/admin_views/tests.py                         |   9 ++
 tests/apps/tests.py                                |   2 +-
 tests/commands_sql/tests.py                        |  28 +++-
 tests/contenttypes_tests/tests.py                  |   2 +-
 tests/i18n/tests.py                                |  11 ++
 tests/migrations/test_autodetector.py              |   4 +-
 tests/migrations/test_graph.py                     |  76 +++++++---
 tests/migrations/test_operations.py                |  33 +++++
 tests/model_inheritance/tests.py                   |  37 +++++
 tests/schema/tests.py                              |   4 +-
 tests/staticfiles_tests/test_liveserver.py         |  10 +-
 73 files changed, 728 insertions(+), 258 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git