Merge branch 'dev_JSC_20181103_profiles_merge' of... (bf92ec3f) · 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

bf92ec3f

Commit bf92ec3f authored 6 years ago by Jean-Sébastien Caux

Downloads
- Plain Diff

Merge branch 'dev_JSC_20181103_profiles_merge' of...

Merge branch 'dev_JSC_20181103_profiles_merge' of https://bitbucket.org/scipostdev/scipost_v1 into dev_JSC_20181103_profiles_merge

parents 77777748 70df5092

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

journals/models.py 8 additions, 9 deletions

journals/models.py
profiles/forms.py 39 additions, 56 deletions

profiles/forms.py
profiles/models.py 1 addition, 1 deletion

profiles/models.py
profiles/templates/profiles/_profile_card.html 18 additions, 17 deletions

profiles/templates/profiles/_profile_card.html
profiles/templates/profiles/profile_duplicate_list.html 12 additions, 8 deletions

profiles/templates/profiles/profile_duplicate_list.html
profiles/templates/profiles/profile_merge.html 22 additions, 18 deletions

profiles/templates/profiles/profile_merge.html
profiles/views.py 24 additions, 24 deletions

profiles/views.py

with 124 additions and 133 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