Merge branch 'master' of https://gitlab.pasteur.fr/odoppelt/iPPIDB (5c9c4980) · Commits · iPPIDB / ippidb-web · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

ippidb-web
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments

Snippets Groups Projects

5c9c4980

Commit 5c9c4980 authored 7 years ago by

Rachel TORCHET

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.pasteur.fr/odoppelt/iPPIDB

Former-commit-id: d0c709d4d7d83924f7ae2f5f69d31c7a3f6e08bd

parents 0d75f1e1 3a1d6d70

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

ippisite/db.sqlite3.REMOVED.git-id 1 addition, 1 deletion

ippisite/db.sqlite3.REMOVED.git-id
ippisite/ippidb/management/commands/import_v1_data.py 31 additions, 2 deletions

ippisite/ippidb/management/commands/import_v1_data.py
ippisite/ippidb/migrations/0025_auto_20171110_1046.py 61 additions, 0 deletions

ippisite/ippidb/migrations/0025_auto_20171110_1046.py
ippisite/ippidb/migrations/0026_auto_20171110_1426.py 20 additions, 0 deletions

ippisite/ippidb/migrations/0026_auto_20171110_1426.py
ippisite/ippidb/models.py 3 additions, 2 deletions

ippisite/ippidb/models.py
ippisite/ippidb/templates/compound_abstract.html 2 additions, 11 deletions

ippisite/ippidb/templates/compound_abstract.html
ippisite/ippidb/templates/compound_list.html 14 additions, 4 deletions

ippisite/ippidb/templates/compound_list.html
ippisite/ippidb/templatetags/__init__.py 0 additions, 0 deletions

ippisite/ippidb/templatetags/__init__.py
ippisite/ippidb/templatetags/customtags.py 9 additions, 0 deletions

ippisite/ippidb/templatetags/customtags.py
ippisite/ippidb/views.py 10 additions, 2 deletions

ippisite/ippidb/views.py

with 151 additions and 22 deletions

0% 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