Commit graph

938 commits

Author SHA1 Message Date
Juan Ignacio Fiorentino cfb3c0a1b2 Update CHANGELOG.md 2016-08-31 16:57:41 -03:00
Ignacio Fiorentino 9bf0c44fb4 Edit CHANGELOG and fix docs. 2016-08-30 12:46:44 -03:00
Ignacio Fiorentino d6a59b2a88 Improve docs. 2016-08-17 11:35:01 -03:00
Juan Ignacio Fiorentino d159a63dc1 Merge pull request #114 from fjouatte/develop
[FIX] #113: Claim Name SHOULD be omitted from the JSON object when not returned
2016-08-17 09:56:54 -03:00
Florent Jouatte 2872d2e10b #113: tiny improvement 2016-08-17 12:24:00 +02:00
Florent Jouatte 2c1d582475 #113: omit claim when empty 2016-08-17 12:13:33 +02:00
Ignacio Fiorentino fc39296610 Merge branch 'grahamu-fix-import-all' into v0.3.x 2016-08-12 12:09:42 -03:00
Ignacio Fiorentino d35f16eeae Merge branch 'fix-import-all' of https://github.com/grahamu/django-oidc-provider into grahamu-fix-import-all 2016-08-12 12:02:48 -03:00
Graham Ullrich 84e80df3a8 Allow test suite specification 2016-08-11 16:19:10 -06:00
Graham Ullrich ba4faee6ef Fix global imports
Global imports ("from X import *") are discouraged in Python.
2016-08-11 16:05:13 -06:00
Ignacio Fiorentino 2214ec0d70 Add missing migration. 2016-08-11 16:56:02 -03:00
Ignacio Fiorentino 988cad073e Add new test for migrations. 2016-08-11 16:43:30 -03:00
Graham Ullrich a7f9b40102 Merge remote-tracking branch 'upstream/master' 2016-08-11 12:47:39 -06:00
Ignacio Fiorentino a93598e1e3 Merge branch 'grahamu-testing' 2016-08-11 15:09:53 -03:00
Ignacio Fiorentino 60cbd2680a Fix travis config. 2016-08-11 15:09:41 -03:00
Graham Ullrich 632eb00e71 Fix Travis config 2016-08-11 11:52:44 -06:00
Graham Ullrich c24e4a48d1 Update version to 0.3.7 after at_hash fix
Using semantic versioning, a backward compatible bug fix deserves
a PATCH increment.
2016-08-11 11:17:25 -06:00
Graham Ullrich b8d1d63c28 Improve tox.ini envlist layout, simplified commands.
Remove tests/app/settings.py in favor of settings in setup.py.
Change MANIFEST.in to include README.md (which exists) instead of README.rst (which does not exist).
Update .travis.yml to use tox instead of `python django_admin.py`, include Django v1.10 in the mix.
2016-08-11 11:13:23 -06:00
Graham Ullrich ce4582f585 Merge remote-tracking branch 'upstream/master' 2016-08-11 11:03:07 -06:00
Ignacio Fiorentino 53c9bf0717 Edit README. 2016-08-11 12:05:52 -03:00
Ignacio Fiorentino 093003291b Edit CHANGELOG. 2016-08-10 18:37:00 -03:00
Ignacio Fiorentino cec9dc6b11 Merge branch 'brosner-fix-id-token-at-hash' into v0.3.x 2016-08-10 18:21:01 -03:00
Ignacio Fiorentino 6151a6cfb9 Merge branch 'fix-id-token-at-hash' of https://github.com/brosner/django-oidc-provider into brosner-fix-id-token-at-hash 2016-08-10 18:13:33 -03:00
Brian Rosner 8a0277e573 Merge pull request #1 from grahamu/test-implicit-flow
Test implicit flow
2016-08-08 12:28:32 -06:00
Graham Ullrich e822252b6e Use original test files 2016-08-08 12:20:47 -06:00
Graham Ullrich e04d42fedf flake8 fixes 2016-08-08 11:54:40 -06:00
Graham Ullrich ffddb69f80 Add tests for at_hash
Ensure at_hash is present in id_token when warranted.
2016-08-08 11:24:07 -06:00
Ignacio Fiorentino 5beaa6bd12 Edit CHANGELOG. 2016-08-08 13:18:39 -03:00
Ignacio Fiorentino 67493eca4a Merge branch 'v0.3.x' of https://github.com/juanifioren/django-oidc-provider into v0.3.x 2016-08-08 13:08:57 -03:00
Juan Ignacio Fiorentino db9f945a6e Merge pull request #109 from koriaf/urlspy-cleanup
Cleanup urls.py - remove unused and wildcard import
2016-08-08 12:16:45 -03:00
Arkadiy Korotaev 8cbf5c3304 Cleanup urls.py - remove unused and wildcard import 2016-08-08 09:58:36 +04:00
Graham Ullrich 86fbfdba60 Merge remote-tracking branch 'brosner/fix-id-token-at-hash' into test-implicit-flow 2016-08-05 15:49:18 -06:00
Brian Rosner afc3a60ee7
Added at_hash when access token is present
This is required by response type "id_token token", but can be
used by other flows if they choose.
2016-08-05 14:00:00 -06:00
Juan Ignacio Fiorentino d7ea6e33cd Update CHANGELOG.md 2016-08-05 13:25:28 -03:00
Ignacio Fiorentino 96a078e757 Merge branch 'master' of https://github.com/juanifioren/django-oidc-provider 2016-08-04 14:35:39 -03:00
Juan Ignacio Fiorentino 642f75677b Merge pull request #108 from grahamu/patch-1
Add Django 1.10 as a supported configuration.
2016-08-04 14:34:09 -03:00
Graham Ullrich b67c35d94a Add Django 1.10 as a supported configuration. 2016-08-04 11:07:34 -06:00
Ignacio Fiorentino 67dd97e8a2 Merge branch 'grahamu-remove-patterns-import' into v0.3.x 2016-08-04 13:35:50 -03:00
Ignacio Fiorentino 2573a60092 Fix test app urls and templates loaders in settings. 2016-08-04 13:35:27 -03:00
Graham Ullrich 3ef8f42cd7 Test against Django v1.10
Add Django 1.10 to test matrix.
2016-08-04 00:30:22 -06:00
Graham Ullrich ddb62a383b Remove unused import
Update mock requirement.
2016-08-03 23:44:17 -06:00
Juan Ignacio Fiorentino 6a15ed66f8 Merge pull request #104 from matterport/dj19-tox
Fix django dep range for 1.9 compat testing
2016-08-02 12:12:37 -03:00
Jeremy Dunck ed19486918 Fix django dep range for 1.9 compat testing 2016-08-01 19:19:48 -07:00
Wojciech Bartosiak c70dab13a8 Merge pull request #5 from juanifioren/v0.3.x
updating
2016-07-29 22:54:37 +02:00
Juan Ignacio Fiorentino e837c222c4 Merge pull request #102 from fjouatte/v0.3.x.
French translation
2016-07-29 10:22:14 -03:00
Florent Jouatte f4c27ed28d tiny translation 2016-07-29 09:07:25 +02:00
Ignacio Fiorentino 3f12db6930 Add doc for tox. 2016-07-28 17:18:11 -03:00
Ignacio Fiorentino 6e771ad5ee Edit tox supporting running single test. 2016-07-28 17:17:23 -03:00
Ignacio Fiorentino 7391a58b69 Tox: Remove previously installed package. 2016-07-28 16:35:12 -03:00
Florent Jouatte c29514ca64 add french translation (not over) 2016-07-28 10:55:06 +02:00