Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mirador-video-annotations
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

26448c93

Verified Commit 26448c93 authored 2 years ago by Loïs Poujade

Downloads
- Plain Diff

Merge branch 'annotation-on-video' into 3-upstream-01022023

parents 347dde1f bd345caa

No related branches found

No related tags found

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

__tests__/src/lib/CanvasAnnotationDisplay.test.js 2 additions, 2 deletions

__tests__/src/lib/CanvasAnnotationDisplay.test.js
src/components/AnnotationsOverlayVideo.js 8 additions, 6 deletions

src/components/AnnotationsOverlayVideo.js
src/lib/CanvasAnnotationDisplay.js 2 additions, 1 deletion

src/lib/CanvasAnnotationDisplay.js

with 12 additions and 9 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