Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Mirador Video
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

92c0cb06

Commit 92c0cb06 authored 2 years ago by Anthony

Downloads
- Plain Diff

Merge branch '18-upgrade-pour-coeso' into 'annotation-on-video'

Add research field and undo research manifest in annotation content

Closes #18

See merge request iiif/mirador-video-annotation!15

parents 735afa7d 885df11b

Branches

Tags

1 merge request!15Add research field and undo research manifest in annotation content

Pipeline #1393 failed 2 years ago

Stage: test

Changes 7
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

src/components/AnnotationManifestsAccordion.js 1 addition, 15 deletions

src/components/AnnotationManifestsAccordion.js
src/components/CanvasAnnotations.js 54 additions, 4 deletions

src/components/CanvasAnnotations.js
src/components/WindowSideBarAnnotationsPanel.js 0 additions, 5 deletions

src/components/WindowSideBarAnnotationsPanel.js
src/containers/CanvasAnnotations.js 29 additions, 6 deletions

src/containers/CanvasAnnotations.js
src/helper/utils.js 6 additions, 3 deletions

src/helper/utils.js
src/locales/en/translation.json 3 additions, 0 deletions

src/locales/en/translation.json
src/locales/fr/translation.json 3 additions, 0 deletions

src/locales/fr/translation.json

with 96 additions and 33 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