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

14095d91

Commit 14095d91 authored 6 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'Ny_server_2019' into 'develop'

Ny server 2019

See merge request !1

parents 8a9059be 09c2eb10

No related branches found

No related tags found

2 merge requests!2Spotit multi org,!1Ny server 2019

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VIPSWeb/local_settings_sample.py 4 additions, 1 deletion

VIPSWeb/local_settings_sample.py
VIPSWeb/static/js/frontpageMap.js 7 additions, 1 deletion

VIPSWeb/static/js/frontpageMap.js
VIPSWeb/templates/index.html 1 addition, 1 deletion

VIPSWeb/templates/index.html
VIPSWeb/templates/settings.js 2 additions, 0 deletions

VIPSWeb/templates/settings.js
fusarium/static/fusarium/js/oatFloweringModelForm.js 21 additions, 13 deletions

fusarium/static/fusarium/js/oatFloweringModelForm.js
observations/static/observations/js/observationList.js 2 additions, 1 deletion

observations/static/observations/js/observationList.js
requirements.txt 1 addition, 1 deletion

requirements.txt
roughage/templates/roughage/nutrition.html 15 additions, 6 deletions

roughage/templates/roughage/nutrition.html

with 53 additions and 24 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