Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Add] django oauth #225

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

[Add] django oauth #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d018faf
[Add] django oauth
Minigrim0 Apr 15, 2021
99b009d
[Fix] requirements
Minigrim0 Apr 15, 2021
2a735c4
[Add] oauth app
Minigrim0 Apr 15, 2021
b8b9d4a
Merge branch 'oauth-django' of github.com:UrLab/incubator into oauth-…
Minigrim0 Apr 15, 2021
2aeb548
Merge remote-tracking branch 'origin' into oauth-django
C4ptainCrunch Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions incubator/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
'constance',
'constance.backends.database',
'simple_history',
'oauth2_provider',

'incubator',
'events',
Expand Down
1 change: 1 addition & 0 deletions incubator/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
path('api/', include('incubator.apiurls')),
path('notifications/', include('django_nyt.urls')),
path('r/<slug:short_name>', redir.views.short_url, name='redirection'),
path('oauth/', include('oauth2_provider.urls', namespace='oauth2_provider')),
]

if settings.DEBUG:
Expand Down
1 change: 1 addition & 0 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ django-extensions
django-filter
django-simple-history
django-mptt
django-oauth-toolkit
https://github.com/darklow/django-suit/tarball/v2
wiki

Expand Down
15 changes: 15 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ certifi==2019.9.11
# via
# requests
# sentry-sdk
cffi==1.14.5
# via cryptography
chardet==3.0.4
# via requests
click==7.1.2
# via pip-tools
cryptography==3.4.7
# via jwcrypto
decorator==4.4.1
# via
# ipython
Expand Down Expand Up @@ -56,6 +60,8 @@ django-mptt==0.11.0
# wiki
django-nyt==1.1.5
# via wiki
django-oauth-toolkit==1.5.0
# via -r requirements.in
django-picklefield==3.0.1
# via django-constance
django-resized==0.3.9
Expand All @@ -76,6 +82,7 @@ django==3.0.14
# django-jsonfield
# django-mptt
# django-nyt
# django-oauth-toolkit
# django-picklefield
# django-sekizai
# djangorestframework
Expand All @@ -94,12 +101,16 @@ ipython==7.9.0
# via -r requirements.in
jedi==0.15.1
# via ipython
jwcrypto==0.8
# via django-oauth-toolkit
markdown==3.2.2
# via
# -r requirements.in
# wiki
mypy-extensions==0.4.3
# via -r requirements.in
oauthlib==3.1.0
# via django-oauth-toolkit
packaging==19.2
# via bleach
parso==0.5.1
Expand All @@ -120,6 +131,8 @@ prompt-toolkit==2.0.10
# via ipython
ptyprocess==0.6.0
# via pexpect
pycparser==2.20
# via cffi
pygments==2.7.4
# via ipython
pyparsing==2.4.3
Expand All @@ -138,6 +151,7 @@ redis==3.3.11
requests==2.22.0
# via
# -r requirements.in
# django-oauth-toolkit
# influxdb
sentry-sdk==0.17.6
# via -r requirements.in
Expand All @@ -147,6 +161,7 @@ six==1.12.0
# django-classy-tags
# django-extensions
# django-jsonfield
# django-oauth-toolkit
# django-simple-history
# ics
# influxdb
Expand Down