[Python-modules-commits] [python-django-debug-toolbar] 02/05: Merge tag 'upstream/1.4'
Andrew Starr-Bochicchio
asb at moszumanska.debian.org
Sun Nov 1 21:55:31 UTC 2015
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 93d6cdd6072b510203ba73cff88837ddf700e3c3
Merge: 642c3e3 1ecc720
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date: Sun Nov 1 16:42:06 2015 -0500
Merge tag 'upstream/1.4'
Upstream version 1.4
.travis.yml | 21 +-
Makefile | 18 +-
README.rst | 5 +-
debug_toolbar/__init__.py | 1 -
debug_toolbar/apps.py | 1 +
debug_toolbar/compat.py | 65 ++++++
debug_toolbar/locale/en/LC_MESSAGES/django.po | 217 +++++++++++----------
debug_toolbar/management/commands/debugsqlshell.py | 14 +-
debug_toolbar/middleware.py | 24 ++-
debug_toolbar/models.py | 9 -
debug_toolbar/panels/__init__.py | 32 ++-
debug_toolbar/panels/cache.py | 86 ++++----
debug_toolbar/panels/headers.py | 9 +-
debug_toolbar/panels/logging.py | 12 +-
debug_toolbar/panels/profiling.py | 41 ++--
debug_toolbar/panels/redirects.py | 8 +-
debug_toolbar/panels/request.py | 2 +-
debug_toolbar/panels/settings.py | 10 +-
debug_toolbar/panels/signals.py | 23 ++-
debug_toolbar/panels/sql/__init__.py | 2 +-
debug_toolbar/panels/sql/forms.py | 4 +-
debug_toolbar/panels/sql/panel.py | 50 ++++-
debug_toolbar/panels/sql/tracking.py | 21 +-
debug_toolbar/panels/sql/utils.py | 3 +-
debug_toolbar/panels/staticfiles.py | 24 ++-
debug_toolbar/panels/templates/__init__.py | 2 +-
debug_toolbar/panels/templates/panel.py | 121 +++++++-----
debug_toolbar/panels/templates/views.py | 22 ++-
debug_toolbar/panels/timer.py | 13 +-
debug_toolbar/panels/versions.py | 26 +--
debug_toolbar/settings.py | 53 +++--
debug_toolbar/static/debug_toolbar/css/print.css | 3 +
debug_toolbar/static/debug_toolbar/css/toolbar.css | 109 ++++++-----
.../static/debug_toolbar/js/jquery_existing.js | 1 +
.../static/debug_toolbar/js/jquery_post.js | 1 +
.../static/debug_toolbar/js/jquery_pre.js | 1 +
debug_toolbar/static/debug_toolbar/js/toolbar.js | 71 ++++---
.../static/debug_toolbar/js/toolbar.profiling.js | 1 +
.../static/debug_toolbar/js/toolbar.sql.js | 3 +
.../static/debug_toolbar/js/toolbar.timer.js | 7 +-
debug_toolbar/templates/debug_toolbar/base.html | 32 ++-
.../templates/debug_toolbar/panels/cache.html | 8 +-
.../templates/debug_toolbar/panels/headers.html | 2 +-
.../templates/debug_toolbar/panels/logging.html | 2 +-
.../templates/debug_toolbar/panels/profiling.html | 7 +-
.../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 | 39 ++--
.../debug_toolbar/panels/sql_explain.html | 6 +-
.../debug_toolbar/panels/sql_profile.html | 6 +-
.../templates/debug_toolbar/panels/sql_select.html | 6 +-
.../debug_toolbar/panels/staticfiles.html | 3 +-
.../debug_toolbar/panels/template_source.html | 4 +-
.../templates/debug_toolbar/panels/templates.html | 6 +-
.../templates/debug_toolbar/panels/timer.html | 14 +-
.../templates/debug_toolbar/panels/versions.html | 2 +-
debug_toolbar/templatetags/__init__.py | 0
debug_toolbar/templatetags/debug_toolbar_compat.py | 13 ++
debug_toolbar/toolbar.py | 34 ++--
debug_toolbar/utils.py | 57 ++++--
docs/changes.rst | 42 ++++
docs/conf.py | 8 +-
docs/configuration.rst | 8 +-
docs/contributing.rst | 8 +-
docs/installation.rst | 13 +-
docs/panels.rst | 97 ++++++++-
docs/tips.rst | 16 +-
example/README.rst | 6 +-
example/django-debug-toolbar.png | Bin 417544 -> 170704 bytes
example/settings.py | 9 +
example/urls.py | 18 +-
example/wsgi.py | 4 +-
requirements_dev.txt | 2 +-
setup.cfg | 8 +
setup.py | 11 +-
tests/__init__.py | 6 +-
tests/base.py | 2 +-
tests/commands/test_debugsqlshell.py | 11 +-
tests/loaders.py | 17 ++
tests/panels/test_cache.py | 25 ++-
tests/panels/test_logging.py | 25 ++-
tests/panels/test_profiling.py | 23 ++-
tests/panels/test_redirects.py | 33 +++-
tests/panels/test_request.py | 15 ++
tests/panels/test_sql.py | 50 ++++-
tests/panels/test_staticfiles.py | 16 ++
tests/panels/test_template.py | 30 ++-
tests/settings.py | 11 +-
tests/templates/{basic.html => base.html} | 1 +
tests/templates/basic.html | 10 +-
tests/test_integration.py | 60 ++++--
tests/test_utils.py | 4 +-
tests/urls.py | 26 ++-
tests/views.py | 6 +
tox.ini | 124 +++---------
96 files changed, 1346 insertions(+), 792 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-debug-toolbar.git
More information about the Python-modules-commits
mailing list