Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

9ceeca86

Commit 9ceeca86 authored 1 year ago by Lene Wasskog

Downloads
- Plain Diff

Merge branch 'develop' into feature/time-series-in-vipsweb

parents cede7804 6acfcad8

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DOWNCASTModelPreprocessor.java 12 additions, 1 deletion

...eduling/model/preprocessor/DOWNCASTModelPreprocessor.java
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties 2 additions, 0 deletions

...ources/no/nibio/vips/logic/i18n/vipslogictexts.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties 2 additions, 0 deletions

...ces/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties 2 additions, 0 deletions

...ces/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties 2 additions, 0 deletions

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties 2 additions, 0 deletions

...ces/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties 2 additions, 0 deletions

.../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
src/main/webapp/templates/observationForm.ftl 34 additions, 31 deletions

src/main/webapp/templates/observationForm.ftl

with 58 additions and 32 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