Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

4437c7ee

Commit 4437c7ee authored 6 years ago by Sven Kästle

Downloads
- Plain Diff

Merge branch 'annotation_#47' into pages_overview

parents 23b80482 924b4c40

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/AnnotationController.java 5 additions, 11 deletions

...f/modules/annotation/controller/AnnotationController.java
gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css 151 additions, 0 deletions

...amforschen/src/main/webapp/assets/css/annotationStyle.css
gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js 456 additions, 0 deletions

...samforschen/src/main/webapp/assets/js/annotationScript.js
gemeinsamforschen/src/main/webapp/pages/annotation_document.html 88 additions, 0 deletions

...amforschen/src/main/webapp/pages/annotation_document.html

with 700 additions and 11 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