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

2cea39f2

Verified Commit 2cea39f2 authored 2 years ago by Loïs Poujade

Downloads
- Plain Diff

Merge branch 'wip14-bug-video-controls-noseekto' into demo_ci

parents b7c8c079 9d2154f8

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

__tests__/integration/mirador/index.html 2 additions, 6 deletions

__tests__/integration/mirador/index.html
src/components/AnnotationsOverlayVideo.js 11 additions, 33 deletions

src/components/AnnotationsOverlayVideo.js
src/components/VideoViewer.js 1 addition, 65 deletions

src/components/VideoViewer.js
src/components/ViewerNavigationVideo.js 13 additions, 6 deletions

src/components/ViewerNavigationVideo.js
src/state/reducers/windows.js 1 addition, 0 deletions

src/state/reducers/windows.js

with 28 additions and 110 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