Merge branch 'master' into staging (ef315f22) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ef315f22

Commit ef315f22 authored 4 years ago by Jean-Sébastien Caux

Downloads
- Plain Diff

Merge branch 'master' into staging

parents bf4a1e1c 701a4542

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

SciPost_v1/settings/base.py 16 additions, 3 deletions

SciPost_v1/settings/base.py
SciPost_v1/settings/local_JSC.py 3 additions, 0 deletions

SciPost_v1/settings/local_JSC.py
SciPost_v1/settings/production.py 6 additions, 0 deletions

SciPost_v1/settings/production.py
SciPost_v1/urls.py 2 additions, 0 deletions

SciPost_v1/urls.py
api/urls.py 6 additions, 0 deletions

api/urls.py
api/views.py 29 additions, 0 deletions

api/views.py
funders/admin.py 1 addition, 1 deletion

funders/admin.py
requirements.txt 2 additions, 0 deletions

requirements.txt
scipost/templates/scipost/login.html 1 addition, 0 deletions

scipost/templates/scipost/login.html
scipost/urls.py 2 additions, 1 deletion

scipost/urls.py
submissions/migrations/0093_auto_20200915_1359.py 17 additions, 0 deletions

submissions/migrations/0093_auto_20200915_1359.py
submissions/models/submission.py 3 additions, 0 deletions

submissions/models/submission.py
templates/oauth2_provider/base.html 1 addition, 0 deletions

templates/oauth2_provider/base.html

with 89 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository