[Python-modules-commits] [django-oauth-toolkit] 06/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Fri Dec 25 13:53:54 UTC 2015
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 1c4eda67035a28ee46eb276e08196db7621c45b2
Merge: 525ca75 e9e48b6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Dec 25 14:06:36 2015 +0100
merge patched into master
.gitignore | 1 +
.travis.yml | 24 +--
AUTHORS | 3 +
README.rst | 20 ++-
debian/.git-dpm | 6 +-
...e-CDN-URL-with-a-local-bootstrap-CSS-file.patch | 2 +-
docs/changelog.rst | 20 ++-
docs/index.rst | 5 +-
docs/install.rst | 1 -
docs/management_commands.rst | 20 +++
docs/rest-framework/permissions.rst | 15 ++
docs/settings.rst | 21 ++-
docs/tutorial/tutorial_01.rst | 22 +--
docs/tutorial/tutorial_03.rst | 6 +-
docs/tutorial/tutorial_04.rst | 2 +-
docs/views/token.rst | 15 ++
docs/views/views.rst | 1 +
oauth2_provider/__init__.py | 4 +-
oauth2_provider/apps.py | 6 +
oauth2_provider/compat.py | 6 +
oauth2_provider/compat_handlers.py | 5 +
oauth2_provider/ext/rest_framework/__init__.py | 2 +-
oauth2_provider/ext/rest_framework/permissions.py | 25 +++
oauth2_provider/forms.py | 13 +-
oauth2_provider/management/__init__.py | 0
oauth2_provider/management/commands/__init__.py | 0
oauth2_provider/management/commands/cleartokens.py | 9 ++
oauth2_provider/migrations/0001_initial.py | 1 +
oauth2_provider/models.py | 38 ++++-
oauth2_provider/oauth2_backends.py | 21 ++-
oauth2_provider/oauth2_validators.py | 8 +-
oauth2_provider/settings.py | 20 ++-
.../application_confirm_delete.html | 2 +-
.../oauth2_provider/application_detail.html | 2 +-
.../oauth2_provider/application_form.html | 2 +-
.../oauth2_provider/application_list.html | 2 +-
.../application_registration_form.html | 2 +-
.../oauth2_provider/authorized-token-delete.html | 9 ++
.../oauth2_provider/authorized-tokens.html | 24 +++
oauth2_provider/templatetags/__init__.py | 0
oauth2_provider/templatetags/compat.py | 10 ++
oauth2_provider/tests/settings.py | 2 +-
oauth2_provider/tests/test_application_views.py | 20 +++
oauth2_provider/tests/test_auth_backends.py | 2 +-
oauth2_provider/tests/test_authorization_code.py | 32 ++++
oauth2_provider/tests/test_client_credential.py | 1 +
oauth2_provider/tests/test_implicit.py | 21 +++
oauth2_provider/tests/test_models.py | 40 +++++
oauth2_provider/tests/test_oauth2_backends.py | 35 ++++
oauth2_provider/tests/test_password.py | 1 +
oauth2_provider/tests/test_rest_framework.py | 51 +++++-
oauth2_provider/tests/test_scopes.py | 1 +
oauth2_provider/tests/test_token_view.py | 178 +++++++++++++++++++++
oauth2_provider/tests/urls.py | 5 +-
oauth2_provider/urls.py | 14 +-
oauth2_provider/views/__init__.py | 1 +
oauth2_provider/views/application.py | 13 +-
oauth2_provider/views/base.py | 8 +-
oauth2_provider/views/generic.py | 4 +-
oauth2_provider/views/token.py | 36 +++++
requirements/base.txt | 7 +-
requirements/optional.txt | 2 +-
requirements/project.txt | 2 +-
requirements/testing.txt | 7 +-
runtests.py | 10 +-
setup.py | 14 +-
tox.ini | 124 ++------------
67 files changed, 810 insertions(+), 216 deletions(-)
diff --cc debian/.git-dpm
index 7878237,0000000..1bc8a6f
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
- 4b5d4f3bd5e03124ac0539fbdc775ac805a11af6
- 4b5d4f3bd5e03124ac0539fbdc775ac805a11af6
- b9b658c70aa989b817f662c357bd5425992e9cd9
++e9e48b6eec6caf32cb99dae04d6e444258541c82
++e9e48b6eec6caf32cb99dae04d6e444258541c82
++1f492d07e26344781bce98475d85d8928d8b2341
+1f492d07e26344781bce98475d85d8928d8b2341
+django-oauth-toolkit_0.10.0.orig.tar.gz
+6746095e2717e7eeb9e6b59c7ddb43f4fc7c3bfe
+69734
diff --cc debian/patches/0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
index 3e8e22e,0000000..8fcb647
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 4b5d4f3bd5e03124ac0539fbdc775ac805a11af6 Mon Sep 17 00:00:00 2001
++From e9e48b6eec6caf32cb99dae04d6e444258541c82 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