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

9c7daf23

Commit 9c7daf23 authored 3 weeks ago by Lene Wasskog

Downloads
- Plain Diff

Merge branch 'feature/vipsutv-1047-timeseries' into develop

parents a6c35dc6 965071a7

Branches

No related tags found

1 merge request!206VIPSUTV-1047 Editing observations belonging to timeseries

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java 2 additions, 2 deletions

.../vips/logic/controller/servlet/ObservationController.java
src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties 4 additions, 0 deletions

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

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
src/main/webapp/formdefinitions/observationForm.json 1 addition, 1 deletion

src/main/webapp/formdefinitions/observationForm.json
src/main/webapp/templates/observationForm.ftl 194 additions, 108 deletions

src/main/webapp/templates/observationForm.ftl

with 205 additions and 111 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