[Python-modules-commits] [python-django-debug-toolbar] 03/08: Merge tag 'upstream/1.5'

[Andrew Starr-Bochicchio]

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

asb pushed a commit to branch master
in repository python-django-debug-toolbar.

commit 6ca6d5bc776e586790a2d8a399b4834e6832828b
Merge: 28ed087 6e230f0
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Sat Aug 20 12:01:46 2016 -0400

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5

 .gitignore                                         |   1 +
 .travis.yml                                        |  20 +--
 Makefile                                           |   6 +
 README.rst                                         |   5 +-
 debug_toolbar/apps.py                              |   2 +-
 debug_toolbar/compat.py                            |  54 ------
 debug_toolbar/middleware.py                        |  17 +-
 debug_toolbar/panels/__init__.py                   |   2 +-
 debug_toolbar/panels/cache.py                      |   2 +-
 debug_toolbar/panels/profiling.py                  |   2 +-
 debug_toolbar/panels/sql/panel.py                  |   8 +-
 debug_toolbar/panels/sql/tracking.py               |   8 +-
 debug_toolbar/panels/sql/utils.py                  |   2 +-
 debug_toolbar/panels/templates/panel.py            |  90 ++++------
 debug_toolbar/panels/templates/views.py            |   5 +-
 debug_toolbar/settings.py                          | 195 +++++++++++----------
 debug_toolbar/static/debug_toolbar/css/toolbar.css |  12 +-
 .../static/debug_toolbar/js/jquery_post.js         |   5 +-
 .../static/debug_toolbar/js/jquery_pre.js          |   6 +-
 debug_toolbar/static/debug_toolbar/js/toolbar.js   |  18 +-
 .../static/debug_toolbar/js/toolbar.timer.js       |  12 +-
 debug_toolbar/templates/debug_toolbar/base.html    |   6 +-
 .../templates/debug_toolbar/panels/cache.html      |   2 +-
 .../templates/debug_toolbar/panels/headers.html    |   2 +-
 .../templates/debug_toolbar/panels/logging.html    |   2 +-
 .../templates/debug_toolbar/panels/profiling.html  |   2 +-
 .../templates/debug_toolbar/panels/request.html    |  12 +-
 .../templates/debug_toolbar/panels/settings.html   |   2 +-
 .../templates/debug_toolbar/panels/signals.html    |   2 +-
 .../templates/debug_toolbar/panels/sql.html        |  10 +-
 .../debug_toolbar/panels/sql_explain.html          |   2 +-
 .../debug_toolbar/panels/sql_profile.html          |   2 +-
 .../templates/debug_toolbar/panels/sql_select.html |   2 +-
 .../debug_toolbar/panels/staticfiles.html          |   2 +-
 .../templates/debug_toolbar/panels/templates.html  |   4 +-
 .../templates/debug_toolbar/panels/timer.html      |   4 +-
 .../templates/debug_toolbar/panels/versions.html   |   2 +-
 debug_toolbar/templatetags/debug_toolbar_compat.py |  13 --
 debug_toolbar/toolbar.py                           |   4 +-
 debug_toolbar/utils.py                             |  60 +++++--
 docs/changes.rst                                   |  19 +-
 docs/conf.py                                       |   4 +-
 docs/installation.rst                              |  78 +++++----
 docs/panels.rst                                    |  18 ++
 example/README.rst                                 |   2 +-
 example/settings.py                                |  13 +-
 setup.py                                           |   9 +-
 tests/__init__.py                                  |   6 +-
 tests/panels/test_redirects.py                     |   9 +-
 tests/panels/test_sql.py                           |   6 +-
 tests/settings.py                                  |   8 +
 tests/test_integration.py                          |  15 +-
 tox.ini                                            |  16 +-
 53 files changed, 411 insertions(+), 399 deletions(-)

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