[Python-modules-commits] [djangorestframework] 05/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Thu Apr 7 02:46:48 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 ae0b2b2b2c03865d07487ede1f7b6bde38abf42a
Merge: ec73649 e3d85ce
Author: Brian May <bam at debian.org>
Date: Thu Apr 7 12:32:00 2016 +1000
merge patched into master
.travis.yml | 9 +-
.tx/config | 1 +
LICENSE.md | 2 +-
README.md | 4 +-
debian/.git-dpm | 6 +-
debian/patches/remove_google_analytics.patch | 2 +-
debian/patches/remove_remote_resources.patch | 4 +-
docs/api-guide/authentication.md | 15 ++
docs/api-guide/fields.md | 6 +-
docs/api-guide/filtering.md | 9 +-
docs/api-guide/generic-views.md | 3 -
docs/api-guide/pagination.md | 6 +-
docs/api-guide/permissions.md | 2 +
docs/api-guide/relations.md | 11 +-
docs/api-guide/serializers.md | 12 +-
docs/api-guide/settings.md | 51 ++--
docs/api-guide/status-codes.md | 1 +
docs/api-guide/versioning.md | 6 +-
docs/img/drfdocs.png | Bin 0 -> 580358 bytes
docs/img/rest-framework-docs.png | Bin 76612 -> 0 bytes
docs/index.md | 2 +-
docs/topics/browsable-api.md | 2 +-
docs/topics/documenting-your-api.md | 27 ++-
docs/topics/html-and-forms.md | 3 +-
docs/topics/release-notes.md | 69 ++++++
docs/topics/third-party-resources.md | 4 +
docs/tutorial/1-serialization.md | 40 ++--
docs/tutorial/4-authentication-and-permissions.md | 2 +-
.../5-relationships-and-hyperlinked-apis.md | 2 +-
docs/tutorial/quickstart.md | 6 +-
requirements/requirements-optionals.txt | 4 +-
requirements/requirements-packaging.txt | 3 +
requirements/requirements-testing.txt | 4 +-
rest_framework/__init__.py | 4 +-
rest_framework/authentication.py | 15 +-
rest_framework/authtoken/__init__.py | 1 +
rest_framework/authtoken/apps.py | 7 +
.../migrations/0002_auto_20160226_1747.py | 34 +++
rest_framework/authtoken/models.py | 10 +-
rest_framework/authtoken/serializers.py | 4 +-
rest_framework/compat.py | 21 +-
rest_framework/fields.py | 24 +-
rest_framework/filters.py | 2 +-
rest_framework/locale/ach/LC_MESSAGES/django.mo | Bin 513 -> 513 bytes
rest_framework/locale/ach/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/ar/LC_MESSAGES/django.mo | Bin 4888 -> 4766 bytes
rest_framework/locale/ar/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/be/LC_MESSAGES/django.mo | Bin 655 -> 655 bytes
rest_framework/locale/be/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/ca/LC_MESSAGES/django.mo | Bin 9749 -> 9646 bytes
rest_framework/locale/ca/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/ca_ES/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
rest_framework/locale/ca_ES/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/cs/LC_MESSAGES/django.mo | Bin 9140 -> 9031 bytes
rest_framework/locale/cs/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/da/LC_MESSAGES/django.mo | Bin 9682 -> 9881 bytes
rest_framework/locale/da/LC_MESSAGES/django.po | 131 ++++++----
rest_framework/locale/da_DK/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/da_DK/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/de/LC_MESSAGES/django.mo | Bin 10465 -> 10364 bytes
rest_framework/locale/de/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/el/LC_MESSAGES/django.mo | Bin 0 -> 512 bytes
.../locale/{en_AU => el}/LC_MESSAGES/django.po | 119 +++++----
.../locale/{fr_CA => el_GR}/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
.../locale/{en_AU => el_GR}/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/en/LC_MESSAGES/django.mo | Bin 9770 -> 10002 bytes
rest_framework/locale/en/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/en_AU/LC_MESSAGES/django.mo | Bin 532 -> 532 bytes
rest_framework/locale/en_AU/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/en_CA/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/en_CA/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/en_US/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes
rest_framework/locale/en_US/LC_MESSAGES/django.po | 113 +++++----
rest_framework/locale/es/LC_MESSAGES/django.mo | Bin 10509 -> 10782 bytes
rest_framework/locale/es/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/et/LC_MESSAGES/django.mo | Bin 8836 -> 8732 bytes
rest_framework/locale/et/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/fa/LC_MESSAGES/django.mo | Bin 0 -> 507 bytes
.../locale/{id => fa}/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/fa_IR/LC_MESSAGES/django.mo | Bin 0 -> 520 bytes
.../locale/{id => fa_IR}/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/fi/LC_MESSAGES/django.mo | Bin 10068 -> 9993 bytes
rest_framework/locale/fi/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/fr/LC_MESSAGES/django.mo | Bin 10501 -> 10770 bytes
rest_framework/locale/fr/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/fr_CA/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
rest_framework/locale/fr_CA/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/gl/LC_MESSAGES/django.mo | Bin 515 -> 515 bytes
rest_framework/locale/gl/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/gl_ES/LC_MESSAGES/django.mo | Bin 669 -> 669 bytes
rest_framework/locale/gl_ES/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/he_IL/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
rest_framework/locale/he_IL/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/hu/LC_MESSAGES/django.mo | Bin 9228 -> 9123 bytes
rest_framework/locale/hu/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/id/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/id/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/it/LC_MESSAGES/django.mo | Bin 9512 -> 10359 bytes
rest_framework/locale/it/LC_MESSAGES/django.po | 141 ++++++-----
rest_framework/locale/ja/LC_MESSAGES/django.mo | Bin 11341 -> 11941 bytes
rest_framework/locale/ja/LC_MESSAGES/django.po | 132 ++++++----
rest_framework/locale/ko_KR/LC_MESSAGES/django.mo | Bin 10148 -> 10022 bytes
rest_framework/locale/ko_KR/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/mk/LC_MESSAGES/django.mo | Bin 10744 -> 10623 bytes
rest_framework/locale/mk/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/nb/LC_MESSAGES/django.mo | Bin 9902 -> 9803 bytes
rest_framework/locale/nb/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/nl/LC_MESSAGES/django.mo | Bin 9267 -> 9165 bytes
rest_framework/locale/nl/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/nn/LC_MESSAGES/django.mo | Bin 524 -> 524 bytes
rest_framework/locale/nn/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/no/LC_MESSAGES/django.mo | Bin 516 -> 516 bytes
rest_framework/locale/no/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/pl/LC_MESSAGES/django.mo | Bin 10528 -> 10799 bytes
rest_framework/locale/pl/LC_MESSAGES/django.po | 121 ++++++----
rest_framework/locale/pt/LC_MESSAGES/django.mo | Bin 517 -> 517 bytes
rest_framework/locale/pt/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/pt_BR/LC_MESSAGES/django.mo | Bin 10343 -> 10238 bytes
rest_framework/locale/pt_BR/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/pt_PT/LC_MESSAGES/django.mo | Bin 534 -> 534 bytes
rest_framework/locale/pt_PT/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/ro/LC_MESSAGES/django.mo | Bin 556 -> 556 bytes
rest_framework/locale/ro/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/ru/LC_MESSAGES/django.mo | Bin 11487 -> 11360 bytes
rest_framework/locale/ru/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/sk/LC_MESSAGES/django.mo | Bin 9524 -> 9411 bytes
rest_framework/locale/sk/LC_MESSAGES/django.po | 117 +++++----
rest_framework/locale/sv/LC_MESSAGES/django.mo | Bin 10151 -> 10073 bytes
rest_framework/locale/sv/LC_MESSAGES/django.po | 119 +++++----
rest_framework/locale/tr/LC_MESSAGES/django.mo | Bin 10269 -> 10548 bytes
rest_framework/locale/tr/LC_MESSAGES/django.po | 122 ++++++----
rest_framework/locale/tr_TR/LC_MESSAGES/django.mo | Bin 1933 -> 10520 bytes
rest_framework/locale/tr_TR/LC_MESSAGES/django.po | 265 ++++++++++++---------
rest_framework/locale/uk/LC_MESSAGES/django.mo | Bin 590 -> 590 bytes
rest_framework/locale/uk/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/vi/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/vi/LC_MESSAGES/django.po | 115 +++++----
.../locale/zh-Hans/LC_MESSAGES/django.mo | Bin 9894 -> 9796 bytes
.../locale/zh-Hans/LC_MESSAGES/django.po | 119 +++++----
.../locale/zh-Hant/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
.../locale/zh-Hant/LC_MESSAGES/django.po | 115 +++++----
rest_framework/locale/zh_CN/LC_MESSAGES/django.mo | Bin 9895 -> 10007 bytes
rest_framework/locale/zh_CN/LC_MESSAGES/django.po | 121 ++++++----
rest_framework/locale/zh_TW/LC_MESSAGES/django.mo | Bin 522 -> 522 bytes
rest_framework/locale/zh_TW/LC_MESSAGES/django.po | 115 +++++----
rest_framework/pagination.py | 2 +-
rest_framework/parsers.py | 2 +-
rest_framework/relations.py | 21 +-
rest_framework/renderers.py | 1 +
rest_framework/serializers.py | 4 +-
rest_framework/settings.py | 19 +-
rest_framework/status.py | 1 +
rest_framework/templates/rest_framework/admin.html | 3 +-
rest_framework/templates/rest_framework/base.html | 4 +-
.../templates/rest_framework/login_base.html | 2 +-
.../rest_framework/vertical/checkbox.html | 2 +-
rest_framework/utils/field_mapping.py | 4 +-
rest_framework/versioning.py | 2 +-
runtests.py | 4 +-
setup.py | 16 ++
tests/models.py | 8 +-
tests/test_authentication.py | 49 +++-
tests/test_fields.py | 12 +-
tests/test_model_serializer.py | 63 ++++-
tests/test_pagination.py | 4 +-
tests/test_relations.py | 22 ++
tests/test_renderers.py | 26 ++
tests/test_settings.py | 15 ++
tests/test_validation.py | 18 ++
tox.ini | 29 +--
170 files changed, 4437 insertions(+), 2497 deletions(-)
diff --cc debian/.git-dpm
index 3f9c08f,0000000..c141034
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
- 276f8e50e128e71aea35116d7f400e7f49c7e741
- 276f8e50e128e71aea35116d7f400e7f49c7e741
- 1bd539431e14611590d5a1ff551253bdb0376e67
++e3d85ceaf201fc63ccc1b2849f00c26c43e527a7
++e3d85ceaf201fc63ccc1b2849f00c26c43e527a7
++def521859a25262c982825f26af67f2e29cf5cbc
+def521859a25262c982825f26af67f2e29cf5cbc
+djangorestframework_3.3.3.orig.tar.gz
+51718a682cc96314e7328d951a4a4f974e788f29
+2617304
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_google_analytics.patch
index d2f746f,0000000..b96e73c
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 276f8e50e128e71aea35116d7f400e7f49c7e741 Mon Sep 17 00:00:00 2001
++From e3d85ceaf201fc63ccc1b2849f00c26c43e527a7 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 65c5df5,0000000..81ccc04
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 ffe2f4fd834b16ec7bf44e89d70f8b82c60e3e87 Mon Sep 17 00:00:00 2001
++From ad7e73195912449c6e6a07719df3ecb3497b0997 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 622e35a..0b4b551 100644
++index a2635c0..78318c1 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**.
--
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