[Python-modules-commits] [djangorestframework] 05/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Jan 3 03:01:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository djangorestframework.
commit 1d77eddb070f2615a06b6a366388dc2ca732f510
Merge: 405af09 276f8e5
Author: Brian May <bam at debian.org>
Date: Sun Jan 3 13:47:03 2016 +1100
merge patched into master
.isort.cfg | 1 +
debian/.git-dpm | 6 +-
debian/patches/0003-Python3.5-fix.patch | 22 --
debian/patches/remove_google_analytics.patch | 2 +-
debian/patches/remove_remote_resources.patch | 4 +-
debian/patches/series | 1 -
docs/api-guide/fields.md | 2 +-
docs/api-guide/filtering.md | 4 +-
docs/api-guide/generic-views.md | 35 +-
docs/api-guide/pagination.md | 3 +
docs/api-guide/parsers.md | 3 +
docs/api-guide/renderers.md | 9 +
docs/api-guide/serializers.md | 4 +
docs/api-guide/versioning.md | 4 +-
docs/index.md | 3 +-
docs/topics/html-and-forms.md | 432 +++++++++++----------
docs/topics/release-notes.md | 71 ++++
docs/tutorial/4-authentication-and-permissions.md | 2 +-
requirements/requirements-codestyle.txt | 2 +-
requirements/requirements-packaging.txt | 2 +-
rest_framework/__init__.py | 2 +-
rest_framework/authtoken/views.py | 2 +-
rest_framework/compat.py | 53 +++
rest_framework/fields.py | 10 +-
rest_framework/filters.py | 27 +-
rest_framework/locale/ach/LC_MESSAGES/django.mo | Bin 0 -> 513 bytes
.../locale/{fr_CA => ach}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/ar/LC_MESSAGES/django.mo | Bin 4888 -> 4888 bytes
rest_framework/locale/ar/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/be/LC_MESSAGES/django.mo | Bin 655 -> 655 bytes
rest_framework/locale/be/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/ca/LC_MESSAGES/django.mo | Bin 9749 -> 9749 bytes
rest_framework/locale/ca/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/ca_ES/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
rest_framework/locale/ca_ES/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/cs/LC_MESSAGES/django.mo | Bin 9140 -> 9140 bytes
rest_framework/locale/cs/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/da/LC_MESSAGES/django.mo | Bin 8905 -> 9682 bytes
rest_framework/locale/da/LC_MESSAGES/django.po | 155 +++++---
.../locale/{en_CA => da_DK}/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
.../locale/{gl => da_DK}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/de/LC_MESSAGES/django.mo | Bin 9544 -> 10465 bytes
rest_framework/locale/de/LC_MESSAGES/django.po | 156 +++++---
rest_framework/locale/en/LC_MESSAGES/django.mo | Bin 9476 -> 9770 bytes
rest_framework/locale/en/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/en_AU/LC_MESSAGES/django.mo | Bin 0 -> 532 bytes
.../locale/{gl => en_AU}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/en_CA/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/en_CA/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/en_US/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes
rest_framework/locale/en_US/LC_MESSAGES/django.po | 138 ++++---
rest_framework/locale/es/LC_MESSAGES/django.mo | Bin 10127 -> 10509 bytes
rest_framework/locale/es/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/et/LC_MESSAGES/django.mo | Bin 8836 -> 8836 bytes
rest_framework/locale/et/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/fi/LC_MESSAGES/django.mo | Bin 0 -> 10068 bytes
rest_framework/locale/fi/LC_MESSAGES/django.po | 428 ++++++++++++++++++++
rest_framework/locale/fr/LC_MESSAGES/django.mo | Bin 10193 -> 10501 bytes
rest_framework/locale/fr/LC_MESSAGES/django.po | 142 ++++---
rest_framework/locale/fr_CA/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
rest_framework/locale/fr_CA/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/gl/LC_MESSAGES/django.mo | Bin 515 -> 515 bytes
rest_framework/locale/gl/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/gl_ES/LC_MESSAGES/django.mo | Bin 669 -> 669 bytes
rest_framework/locale/gl_ES/LC_MESSAGES/django.po | 140 ++++---
.../locale/{ca_ES => he_IL}/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
.../locale/{gl => he_IL}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/hu/LC_MESSAGES/django.mo | Bin 9228 -> 9228 bytes
rest_framework/locale/hu/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/id/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/id/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/it/LC_MESSAGES/django.mo | Bin 9512 -> 9512 bytes
rest_framework/locale/it/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/ja/LC_MESSAGES/django.mo | Bin 11341 -> 11341 bytes
rest_framework/locale/ja/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/ko_KR/LC_MESSAGES/django.mo | Bin 10148 -> 10148 bytes
rest_framework/locale/ko_KR/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/mk/LC_MESSAGES/django.mo | Bin 10744 -> 10744 bytes
rest_framework/locale/mk/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/nb/LC_MESSAGES/django.mo | Bin 524 -> 9902 bytes
rest_framework/locale/nb/LC_MESSAGES/django.po | 311 ++++++++-------
rest_framework/locale/nl/LC_MESSAGES/django.mo | Bin 9267 -> 9267 bytes
rest_framework/locale/nl/LC_MESSAGES/django.po | 140 ++++---
.../locale/{nb => nn}/LC_MESSAGES/django.mo | Bin 524 -> 524 bytes
.../locale/{gl => nn}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/no/LC_MESSAGES/django.mo | Bin 0 -> 516 bytes
.../locale/{gl => no}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/pl/LC_MESSAGES/django.mo | Bin 9602 -> 10528 bytes
rest_framework/locale/pl/LC_MESSAGES/django.po | 154 +++++---
rest_framework/locale/pt/LC_MESSAGES/django.mo | Bin 517 -> 517 bytes
rest_framework/locale/pt/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/pt_BR/LC_MESSAGES/django.mo | Bin 9974 -> 10343 bytes
rest_framework/locale/pt_BR/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/pt_PT/LC_MESSAGES/django.mo | Bin 534 -> 534 bytes
rest_framework/locale/pt_PT/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/ro/LC_MESSAGES/django.mo | Bin 0 -> 556 bytes
.../locale/{fr_CA => ro}/LC_MESSAGES/django.po | 146 ++++---
rest_framework/locale/ru/LC_MESSAGES/django.mo | Bin 11487 -> 11487 bytes
rest_framework/locale/ru/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/sk/LC_MESSAGES/django.mo | Bin 9524 -> 9524 bytes
rest_framework/locale/sk/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/sv/LC_MESSAGES/django.mo | Bin 9519 -> 10151 bytes
rest_framework/locale/sv/LC_MESSAGES/django.po | 150 ++++---
rest_framework/locale/tr/LC_MESSAGES/django.mo | Bin 9211 -> 10269 bytes
rest_framework/locale/tr/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/tr_TR/LC_MESSAGES/django.mo | Bin 522 -> 1933 bytes
rest_framework/locale/tr_TR/LC_MESSAGES/django.po | 173 +++++----
rest_framework/locale/uk/LC_MESSAGES/django.mo | Bin 590 -> 590 bytes
rest_framework/locale/uk/LC_MESSAGES/django.po | 140 ++++---
rest_framework/locale/vi/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/vi/LC_MESSAGES/django.po | 140 ++++---
.../locale/zh-Hans/LC_MESSAGES/django.mo | Bin 0 -> 9894 bytes
.../{zh_CN => zh-Hans}/LC_MESSAGES/django.po | 165 ++++----
.../{en_CA => zh-Hant}/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
.../locale/{id => zh-Hant}/LC_MESSAGES/django.po | 144 ++++---
rest_framework/locale/zh_CN/LC_MESSAGES/django.mo | Bin 9261 -> 9895 bytes
rest_framework/locale/zh_CN/LC_MESSAGES/django.po | 151 ++++---
rest_framework/locale/zh_TW/LC_MESSAGES/django.mo | Bin 522 -> 522 bytes
rest_framework/locale/zh_TW/LC_MESSAGES/django.po | 140 ++++---
rest_framework/pagination.py | 19 +-
rest_framework/permissions.py | 16 +-
rest_framework/relations.py | 3 +
rest_framework/renderers.py | 35 +-
.../static/rest_framework/css/bootstrap-tweaks.css | 5 +
.../templates/rest_framework/admin/list.html | 15 +-
rest_framework/templates/rest_framework/base.html | 24 +-
rest_framework/templatetags/rest_framework.py | 11 +-
rest_framework/urls.py | 5 +-
rest_framework/utils/model_meta.py | 10 +-
rest_framework/utils/representation.py | 2 +-
rest_framework/utils/serializer_helpers.py | 2 +-
tests/test_bound_fields.py | 37 ++
tests/test_fields.py | 14 +-
tests/test_pagination.py | 59 +++
tests/test_relations.py | 11 +
tests/test_request.py | 5 +-
tox.ini | 19 +-
137 files changed, 5051 insertions(+), 3169 deletions(-)
diff --cc debian/.git-dpm
index 61f29df,0000000..8d4e3a0
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
- 41637c0e442bedbc2f214ca9193affd4dba440c8
- 41637c0e442bedbc2f214ca9193affd4dba440c8
- 286de65f88dfdd5c32b75f461037b6b0141bf2d0
++276f8e50e128e71aea35116d7f400e7f49c7e741
++276f8e50e128e71aea35116d7f400e7f49c7e741
++1bd539431e14611590d5a1ff551253bdb0376e67
+1bd539431e14611590d5a1ff551253bdb0376e67
+djangorestframework_3.3.2.orig.tar.gz
+6f815f8ba6e00c0741173da1e89ed4f0cf12e906
+2129791
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_google_analytics.patch
index 8ff3485,0000000..d2f746f
mode 100644,000000..100644
--- a/debian/patches/remove_google_analytics.patch
+++ b/debian/patches/remove_google_analytics.patch
@@@ -1,36 -1,0 +1,36 @@@
- From fff278014f4aa1ef7a15f8548b44cecee33c24bf Mon Sep 17 00:00:00 2001
++From 276f8e50e128e71aea35116d7f400e7f49c7e741 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:58:40 -0700
+Subject: remove_google_analytics
+
+Patch-Name: remove_google_analytics.patch
+---
+ docs_theme/base.html | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/docs_theme/base.html b/docs_theme/base.html
+index 369927b..0b4af51 100644
+--- a/docs_theme/base.html
++++ b/docs_theme/base.html
+@@ -22,21 +22,6 @@
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+- <script type="text/javascript">
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', 'UA-18852272-2']);
+- _gaq.push(['_trackPageview']);
+-
+- (function() {
+- var ga = document.createElement('script');
+- ga.type = 'text/javascript';
+- ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0];
+- s.parentNode.insertBefore(ga, s);
+- })();
+- </script>
+-
+ <style>
+ span.fusion-wrap a {
+ display: block;
diff --cc debian/patches/remove_remote_resources.patch
index bbfb63d,0000000..65c5df5
mode 100644,000000..100644
--- a/debian/patches/remove_remote_resources.patch
+++ b/debian/patches/remove_remote_resources.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 5d04b649c09c46efe67c1c6a58debc6867479689 Mon Sep 17 00:00:00 2001
++From ffe2f4fd834b16ec7bf44e89d70f8b82c60e3e87 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:58:39 -0700
+Subject: Removed remote resouces in index.md
+
+Last-Update: 2014-06-10
+Patch-Name: remove_remote_resources.patch
+---
+ docs/index.md | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/docs/index.md b/docs/index.md
- index edfae2a..c559dce 100644
++index 622e35a..0b4b551 100644
+--- a/docs/index.md
++++ b/docs/index.md
+@@ -220,9 +220,6 @@ For support please see the [REST framework discussion group][group], try the `#
+
+ For updates on REST framework development, you may also want to follow [the author][twitter] on Twitter.
+
+-<a style="padding-top: 10px" href="https://twitter.com/_tomchristie" class="twitter-follow-button" data-show-count="false">Follow @_tomchristie</a>
+-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+-
+ ## Security
+
+ If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
diff --cc debian/patches/series
index 27582b9,0000000..4ed7f40
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+remove_remote_resources.patch
+remove_google_analytics.patch
- 0003-Python3.5-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework.git
More information about the Python-modules-commits
mailing list