[Python-modules-commits] [django-tables] 02/07: Merge tag 'upstream/1.14.2' into debian/master

[Brian May]

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

bam pushed a commit to branch debian/master
in repository django-tables.

commit b7312509c4c7c8bb325622c3f1b0ebdae524487e
Merge: 54b6e79 5423768
Author: Brian May <bam at debian.org>
Date:   Tue Oct 31 08:01:42 2017 +1100

    Merge tag 'upstream/1.14.2' into debian/master
    
    Upstream version 1.14.2

 .isort.cfg                                     |   2 +-
 CHANGELOG.md                                   |  27 ++++++++--
 django_tables2/__init__.py                     |   2 +-
 django_tables2/columns/manytomanycolumn.py     |  16 +++++-
 django_tables2/columns/templatecolumn.py       |  23 ++++++--
 django_tables2/export/views.py                 |   6 ++-
 django_tables2/locale/hu/LC_MESSAGES/django.mo | Bin 0 -> 767 bytes
 django_tables2/locale/hu/LC_MESSAGES/django.po |  46 ++++++++++++++++
 django_tables2/rows.py                         |  27 ++++------
 django_tables2/tables.py                       |  20 +++++--
 django_tables2/utils.py                        |   2 +-
 django_tables2/views.py                        |  10 +++-
 docs/pages/api-reference.rst                   |  46 ++++++++++------
 docs/pages/custom-data.rst                     |   4 +-
 docs/pages/export.rst                          |  53 +++++++++++++++++-
 docs/pages/faq.rst                             |  28 +---------
 docs/pages/filtering.rst                       |  21 +++++++-
 docs/pages/ordering.rst                        |  27 ++++++++++
 docs/requirements.txt                          |   1 -
 example/app/data.py                            |  46 ++++++++++++++++
 example/app/migrations/0001_initial.py         |  44 +++++++++++++++
 example/app/migrations/__init__.py             |   0
 example/app/views.py                           |  12 +++--
 example/requirements.pip                       |   1 +
 requirements/common.pip                        |   2 +-
 requirements/django-dev.pip                    |   3 +-
 setup.py                                       |   1 +
 tests/columns/test_manytomanycolumn.py         |  50 +++++++++++++++--
 tests/columns/test_templatecolumn.py           |  32 +++++++++++
 tests/export/test_export.py                    |  71 +++++++++++++++++++++++--
 tests/test_core.py                             |   5 ++
 tests/test_data.py                             |  12 ++---
 tests/test_faq.py                              |  28 +---------
 tests/test_pinned_rows.py                      |   4 +-
 tests/test_rows.py                             |   8 +--
 tox.ini                                        |  10 ++--
 36 files changed, 549 insertions(+), 141 deletions(-)

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