[Python-modules-commits] [django-tables] 04/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Tue May 3 01:55:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-tables.
commit 9c9975341ed563febfa99cd8bd899d86f4f8d498
Merge: 5667f1d 0260f08
Author: Brian May <bam at debian.org>
Date: Tue May 3 10:37:25 2016 +1000
merge patched into master
CHANGELOG.md | 19 +-
CONTRIBUTING.md | 44 ++++
README.rst | 39 +---
debian/.git-dpm | 6 +-
debian/patches/local_inventory | 2 +-
django_tables2/__init__.py | 2 +-
django_tables2/columns/emailcolumn.py | 16 +-
django_tables2/columns/linkcolumn.py | 54 ++---
django_tables2/columns/urlcolumn.py | 18 +-
django_tables2/config.py | 7 +-
django_tables2/locale/en/LC_MESSAGES/django.mo | Bin 392 -> 606 bytes
django_tables2/locale/en/LC_MESSAGES/django.po | 31 ++-
django_tables2/locale/it/LC_MESSAGES/django.mo | Bin 0 -> 762 bytes
django_tables2/locale/it/LC_MESSAGES/django.po | 45 ++++
django_tables2/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 776 bytes
django_tables2/locale/nl/LC_MESSAGES/django.po | 45 ++++
django_tables2/rows.py | 93 +++++----
django_tables2/tables.py | 72 ++++---
.../templates/django_tables2/bootstrap.html | 6 +-
django_tables2/templates/django_tables2/table.html | 6 +-
django_tables2/utils.py | 77 +++++--
django_tables2/views.py | 29 ++-
docs/index.rst | 8 +-
docs/pages/accessors.rst | 7 +-
docs/pages/api-reference.rst | 46 +++--
docs/pages/column-attributes.rst | 12 +-
docs/pages/column-headers.rst | 19 +-
docs/pages/custom-rendering.rst | 22 +-
docs/pages/generic-mixins.rst | 10 +-
docs/pages/glossary.rst | 2 +-
docs/pages/internal.rst | 3 +-
docs/pages/localization-control.rst | 3 -
docs/pages/order-by-accessors.rst | 15 +-
docs/pages/pagination.rst | 9 +-
docs/pages/query-string-fields.rst | 11 +-
docs/pages/swapping-columns.rst | 6 +-
docs/pages/table-data.rst | 7 +-
docs/pages/tables-for-models.rst | 2 +-
docs/pages/template-filters.rst | 2 +-
docs/pages/template-tags.rst | 13 +-
docs/pages/tutorial.rst | 2 +-
docs/pages/upgrading-from-v1.rst | 10 +-
setup.py | 2 +-
tests/app/urls.py | 9 +-
tests/columns/test_booleancolumn.py | 30 +--
tests/columns/test_checkboxcolumn.py | 59 ++++--
tests/columns/test_datecolumn.py | 39 ++--
tests/columns/test_datetimecolumn.py | 44 ++--
tests/columns/test_emailcolumn.py | 28 +--
tests/columns/test_filecolumn.py | 3 +-
tests/columns/test_general.py | 150 +++++++-------
tests/columns/test_linkcolumn.py | 51 +++--
tests/columns/test_templatecolumn.py | 31 +--
tests/columns/test_timecolumn.py | 11 +-
tests/columns/test_urlcolumn.py | 34 ++-
tests/test_core.py | 228 +++++++++++++--------
tests/test_models.py | 34 +--
tests/test_rows.py | 16 +-
tests/test_templates.py | 22 ++
tests/test_utils.py | 110 ++++++++--
tests/test_views.py | 71 +++++--
61 files changed, 1135 insertions(+), 657 deletions(-)
diff --cc debian/.git-dpm
index 36f77a1,0000000..c7338f9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- b53c79c78ff7e1344e79cf55c3af7a567fdb8081
- b53c79c78ff7e1344e79cf55c3af7a567fdb8081
- 5119d5474f79dc86c40d7d395e374fc939b68332
++0260f088cc55b749f8fa9ea87f6fe8720b8e1145
++0260f088cc55b749f8fa9ea87f6fe8720b8e1145
++ef66a89cc2badd78e4e67573e6bfc23c221e6095
+ef66a89cc2badd78e4e67573e6bfc23c221e6095
+django-tables_1.2.0.orig.tar.gz
+e66bad8133d4686d905d8919e3caed069b5f4492
+116722
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/local_inventory
index 906ec07,0000000..2c3596d
mode 100644,000000..100644
--- a/debian/patches/local_inventory
+++ b/debian/patches/local_inventory
@@@ -1,27 -1,0 +1,27 @@@
- From b53c79c78ff7e1344e79cf55c3af7a567fdb8081 Mon Sep 17 00:00:00 2001
++From 0260f088cc55b749f8fa9ea87f6fe8720b8e1145 Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Thu, 8 Oct 2015 08:57:46 -0700
+Subject: Use local copies of object.inv for building documentation.
+
+Last-Update: 2013-06-20
+
+Patch-Name: local_inventory
+---
+ docs/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 42836f5..2082598 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -28,8 +28,8 @@ extensions = [
+ ]
+
+ intersphinx_mapping = {
+- 'python': ('http://docs.python.org/dev/', None),
+- 'django': ('http://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/'),
++ 'python': ('/usr/share/doc/python2.7-doc/html', None),
++ 'django': ('/usr/share/doc/python-django-doc/html', None),
+ }
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-tables.git
More information about the Python-modules-commits
mailing list