Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VIPSWeb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

2b949a4a

Commit 2b949a4a authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'develop' into 'spotit_multi_org'

# Conflicts:
#   forecasts/models.py

parents b9f1ef2e ec5d1eb1

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
Jenkinsfile 36 additions, 0 deletions

Jenkinsfile
VIPSWeb/local_settings_sample.py 3 additions, 3 deletions

VIPSWeb/local_settings_sample.py
VIPSWeb/static/js/frontpage.js 2 additions, 3 deletions

VIPSWeb/static/js/frontpage.js
VIPSWeb/test.py 23 additions, 0 deletions

VIPSWeb/test.py
forecasts/models.py 1 addition, 1 deletion

forecasts/models.py
forecasts/views.py 1 addition, 0 deletions

forecasts/views.py
fusarium/templates/fusarium/oat_flowering.html 1 addition, 1 deletion

fusarium/templates/fusarium/oat_flowering.html
mock/templates/mock/zymogridmapclient.html 9 additions, 6 deletions

mock/templates/mock/zymogridmapclient.html
requirements.txt 1 addition, 0 deletions

requirements.txt

with 78 additions and 14 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