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

f7412295

Commit f7412295 authored 7 months ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'feature/vipsutv-757-byggbrunflekk' into feature/vipsutv-801-eplevikler

parents 058cf760 9df20902

No related branches found

No related tags found

Loading

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

VIPSWeb/local_settings_sample.py 4 additions, 0 deletions

VIPSWeb/local_settings_sample.py
VIPSWeb/settings.py 0 additions, 3 deletions

VIPSWeb/settings.py
VIPSWeb/static/js/util.js 37 additions, 0 deletions

VIPSWeb/static/js/util.js
VIPSWeb/templates/settings.js 2 additions, 0 deletions

VIPSWeb/templates/settings.js
cerealblotchmodels/static/cerealblotchmodels/formdefinitions/septoriaHumidityForm.json 12 additions, 2 deletions

...ealblotchmodels/formdefinitions/septoriaHumidityForm.json
cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html 212 additions, 116 deletions

...els/templates/cerealblotchmodels/barleynetblotchform.html
cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html 257 additions, 56 deletions

...mplates/cerealblotchmodels/septoriahumiditymodelform.html

with 524 additions and 177 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