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

c4064798

Commit c4064798 authored 6 years ago by Axel

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/annotation_#47-3' into development_master_refactoring_1

parents f7efef99 33bf6735

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css 11 additions, 3 deletions

...amforschen/src/main/webapp/assets/css/annotationStyle.css
gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js 53 additions, 6 deletions

...samforschen/src/main/webapp/assets/js/annotationScript.js
gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js 0 additions, 1 deletion

...forschen/src/main/webapp/assets/js/annotationWebsocket.js
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp 1 addition, 0 deletions

...samforschen/src/main/webapp/pages/annotation-document.jsp

with 65 additions and 10 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