Merge branch 'master' into development (e3fc78ac) · 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

e3fc78ac

Commit e3fc78ac authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge branch 'master' into development

parents 7ba729ce 000711e3

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

SciPost_v1/settings/base.py 39 additions, 0 deletions

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

SciPost_v1/settings/local_JSC.py
SciPost_v1/settings/local_jorran.py 4 additions, 0 deletions

SciPost_v1/settings/local_jorran.py
SciPost_v1/settings/production.py 4 additions, 0 deletions

SciPost_v1/settings/production.py
journals/migrations/0003_auto_20180117_2323.py 37 additions, 0 deletions

journals/migrations/0003_auto_20180117_2323.py
journals/models.py 8 additions, 6 deletions

journals/models.py
journals/views.py 53 additions, 24 deletions

journals/views.py
scipost/services.py 44 additions, 3 deletions

scipost/services.py
scipost/static/scipost/assets/css/_navbar.scss 14 additions, 14 deletions

scipost/static/scipost/assets/css/_navbar.scss
submissions/constants.py 1 addition, 1 deletion

submissions/constants.py
submissions/forms.py 2 additions, 2 deletions

submissions/forms.py
submissions/migrations/0002_auto_20180118_1033.py 25 additions, 0 deletions

submissions/migrations/0002_auto_20180118_1033.py

with 235 additions and 50 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