Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

35e27293

Commit 35e27293 authored 2 years ago by Hartung, Michael

Downloads
- Plain Diff

Merge branch 'development' of...

Merge branch 'development' of gitlab.rrz.uni-hamburg.de:cosy-bio/drugst.one/backend into development


Former-commit-id: 178f9a0f

parents 6884af46 dd5baaee

No related branches found

No related tags found

No related merge requests found

Changes 17

Show whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 6 deletions

Dockerfile
docker-compose.yml 9 additions, 9 deletions

docker-compose.yml
docker-django.env 2 additions, 1 deletion

docker-django.env
docker-django.env.dev 2 additions, 1 deletion

docker-django.env.dev
drugstone/backend_tasks.py 13 additions, 3 deletions

drugstone/backend_tasks.py
drugstone/management/commands/import_from_nedrex.py 1 addition, 1 deletion

drugstone/management/commands/import_from_nedrex.py
drugstone/management/commands/make_graphs.py 2 additions, 2 deletions

drugstone/management/commands/make_graphs.py
drugstone/management/commands/populate_db.py 39 additions, 26 deletions

drugstone/management/commands/populate_db.py
drugstone/management/includes/DatasetLoader.py 28 additions, 6 deletions

drugstone/management/includes/DatasetLoader.py
drugstone/models.py 15 additions, 2 deletions

drugstone/models.py
drugstone/settings/celery_schedule.py 2 additions, 1 deletion

drugstone/settings/celery_schedule.py
drugstone/urls.py 2 additions, 1 deletion

drugstone/urls.py
drugstone/util/query_db.py 80 additions, 3 deletions

drugstone/util/query_db.py
drugstone/views.py 60 additions, 93 deletions

drugstone/views.py
requirements.txt 17 additions, 15 deletions

requirements.txt
scripts/docker-entrypoint.sh 7 additions, 3 deletions

scripts/docker-entrypoint.sh
tasks/multi_steiner.py 0 additions, 1 deletion

tasks/multi_steiner.py

with 280 additions and 174 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