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

26e6a573

Commit 26e6a573 authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge branch 'master' into development

parents 570e2e3f 2e66e447

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

journals/models.py 68 additions, 13 deletions

journals/models.py
scipost/models.py 5 additions, 3 deletions

scipost/models.py
scipost/static/scipost/assets/js/dynamic_loading.js 0 additions, 25 deletions

scipost/static/scipost/assets/js/dynamic_loading.js
scipost/views.py 1 addition, 1 deletion

scipost/views.py
stats/templates/stats/statistics.html 113 additions, 69 deletions

stats/templates/stats/statistics.html
stats/templatetags/stats_extras.py 14 additions, 56 deletions

stats/templatetags/stats_extras.py
stats/views.py 5 additions, 7 deletions

stats/views.py
submissions/migrations/0005_auto_20180123_2312.py 0 additions, 4 deletions

submissions/migrations/0005_auto_20180123_2312.py
submissions/migrations/0008_auto_20180127_2208.py 19 additions, 0 deletions

submissions/migrations/0008_auto_20180127_2208.py
submissions/templates/submissions/pool/pool.html 0 additions, 12 deletions

submissions/templates/submissions/pool/pool.html
submissions/views.py 4 additions, 3 deletions

submissions/views.py

with 229 additions and 193 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