[Python-modules-commits] [django-oauth-toolkit] 04/12: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Wed Dec 7 19:43:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-oauth-toolkit.
commit 77ef51c1837f20bf309333377aa7d3c63f490ad7
Merge: 5bda0b3 15d5d2f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Dec 7 17:09:19 2016 +0100
merge patched into master
.travis.yml | 42 +++---
AUTHORS | 7 +
CONTRIBUTING.rst | 2 +-
README.rst | 29 +++-
debian/.git-dpm | 6 +-
...e-CDN-URL-with-a-local-bootstrap-CSS-file.patch | 2 +-
docs/advanced_topics.rst | 10 +-
docs/changelog.rst | 11 ++
docs/conf.py | 5 +-
docs/contributing.rst | 4 +-
docs/install.rst | 4 +-
docs/rest-framework/getting_started.rst | 6 +-
docs/rest-framework/permissions.rst | 18 +++
docs/settings.rst | 6 +-
docs/tutorial/tutorial_01.rst | 29 ++--
docs/tutorial/tutorial_02.rst | 42 +++++-
docs/tutorial/tutorial_03.rst | 5 +-
oauth2_provider/__init__.py | 2 +-
oauth2_provider/admin.py | 1 +
oauth2_provider/backends.py | 10 +-
oauth2_provider/compat.py | 32 +----
oauth2_provider/compat_handlers.py | 1 +
oauth2_provider/ext/rest_framework/__init__.py | 2 +
oauth2_provider/ext/rest_framework/permissions.py | 25 +++-
oauth2_provider/management/commands/cleartokens.py | 2 +-
oauth2_provider/middleware.py | 12 +-
.../migrations/0003_auto_20160316_1503.py | 20 +++
.../migrations/0004_auto_20160525_1623.py | 29 ++++
oauth2_provider/models.py | 28 ++--
oauth2_provider/oauth2_validators.py | 103 ++++++++++---
oauth2_provider/settings.py | 1 +
oauth2_provider/south_migrations/0001_initial.py | 159 ---------------------
.../south_migrations/0002_adding_indexes.py | 119 ---------------
...n_skip_authorization__chg_field_accesstoken_.py | 121 ----------------
oauth2_provider/south_migrations/__init__.py | 0
oauth2_provider/templates/404.html | 6 -
.../application_confirm_delete.html | 3 +-
.../oauth2_provider/application_detail.html | 3 +-
.../oauth2_provider/application_form.html | 3 +-
.../oauth2_provider/application_list.html | 3 +-
.../application_registration_form.html | 3 +-
.../oauth2_provider/authorized-tokens.html | 1 -
oauth2_provider/templatetags/__init__.py | 0
oauth2_provider/templatetags/compat.py | 10 --
oauth2_provider/tests/settings.py | 38 ++---
oauth2_provider/tests/test_application_views.py | 5 +-
oauth2_provider/tests/test_auth_backends.py | 6 +-
oauth2_provider/tests/test_authorization_code.py | 42 ++++--
oauth2_provider/tests/test_client_credential.py | 2 +-
oauth2_provider/tests/test_decorators.py | 3 +-
oauth2_provider/tests/test_implicit.py | 9 +-
oauth2_provider/tests/test_mixins.py | 5 -
oauth2_provider/tests/test_models.py | 19 +--
oauth2_provider/tests/test_oauth2_backends.py | 1 -
oauth2_provider/tests/test_oauth2_validators.py | 148 ++++++++++++++++++-
oauth2_provider/tests/test_password.py | 4 +-
oauth2_provider/tests/test_rest_framework.py | 71 +++++++--
oauth2_provider/tests/test_scopes.py | 6 +-
oauth2_provider/tests/test_token_revocation.py | 5 +-
oauth2_provider/tests/test_token_view.py | 3 +-
oauth2_provider/tests/urls.py | 4 +-
oauth2_provider/urls.py | 12 +-
oauth2_provider/views/__init__.py | 1 +
oauth2_provider/views/base.py | 6 +-
requirements/base.txt | 2 +-
requirements/testing.txt | 1 -
runtests.py | 6 +-
setup.cfg | 2 +
setup.py | 2 +-
tox.ini | 31 ++--
70 files changed, 687 insertions(+), 674 deletions(-)
diff --cc debian/.git-dpm
index d3d4e09,0000000..e23593c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- e9e48b6eec6caf32cb99dae04d6e444258541c82
- e9e48b6eec6caf32cb99dae04d6e444258541c82
- 1f492d07e26344781bce98475d85d8928d8b2341
++15d5d2f5fe0decbee63bff4e3673da6b4e2ae518
++15d5d2f5fe0decbee63bff4e3673da6b4e2ae518
++acc128fd39dff68579749639a8dbffa64a0e4a78
+acc128fd39dff68579749639a8dbffa64a0e4a78
+django-oauth-toolkit_0.11.0.orig.tar.gz
+c854ec40ea5d3c4960dc8ab5863809613b92888f
+69928
diff --cc debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
index 8fcb647,0000000..1fc8c64
mode 100644,000000..100644
--- a/debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
+++ b/debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
@@@ -1,26 -1,0 +1,26 @@@
- From e9e48b6eec6caf32cb99dae04d6e444258541c82 Mon Sep 17 00:00:00 2001
++From 15d5d2f5fe0decbee63bff4e3673da6b4e2ae518 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Fri, 25 Dec 2015 14:05:27 +0100
+Subject: Replace CDN URL with a local bootstrap CSS file
+
+Last-Update: 2015-08-27
+Forwarded: not-needed
+---
+ oauth2_provider/templates/oauth2_provider/base.html | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/oauth2_provider/templates/oauth2_provider/base.html b/oauth2_provider/templates/oauth2_provider/base.html
+index 0781951..3f2afb1 100644
+--- a/oauth2_provider/templates/oauth2_provider/base.html
++++ b/oauth2_provider/templates/oauth2_provider/base.html
+@@ -7,8 +7,9 @@
+ <meta name="description" content="">
+ <meta name="author" content="">
+
++ {% load staticfiles %}
+ {% block css %}
+- <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
++ <link href="{% static 'oauth2_provider/bootstrap.min.css' %}" rel="stylesheet">
+ {% endblock css %}
+
+ <style>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-oauth-toolkit.git
More information about the Python-modules-commits
mailing list