Merge branch 'master' into dev_JSC_20220304_nominations (179581a9) · 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

179581a9

Commit 179581a9 authored 3 years ago by Jean-Sébastien Caux

Downloads
- Plain Diff

Merge branch 'master' into dev_JSC_20220304_nominations

parents d105a262 7e4c9600

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

scipost_django/affiliates/migrations/0010_affiliatejournal_logo.py 18 additions, 0 deletions

...jango/affiliates/migrations/0010_affiliatejournal_logo.py
scipost_django/affiliates/migrations/0011_auto_20220304_1952.py 25 additions, 0 deletions

...t_django/affiliates/migrations/0011_auto_20220304_1952.py
scipost_django/affiliates/migrations/0012_affiliatejournal_logo_svg.py 19 additions, 0 deletions

...o/affiliates/migrations/0012_affiliatejournal_logo_svg.py
scipost_django/affiliates/models/journal.py 16 additions, 1 deletion

scipost_django/affiliates/models/journal.py
scipost_django/affiliates/templates/affiliates/affiliatejournal_detail.html 11 additions, 0 deletions

...iliates/templates/affiliates/affiliatejournal_detail.html
scipost_django/affiliates/templates/affiliates/affiliatejournal_list.html 19 additions, 4 deletions

...ffiliates/templates/affiliates/affiliatejournal_list.html

with 108 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