Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

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

Snippets Groups Projects

1d84b116

Verified Commit 1d84b116 authored 2 years ago by Loïs Poujade

Downloads
- Plain Diff

Merge branch '2-update-from-upstream' into Add-img-annotation-insert-edit

parents 1cf3ea44 3d9ef3dc

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.eslintrc 4 additions, 2 deletions

.eslintrc
__tests__/AnnotationCreation.test.js 1 addition, 1 deletion

__tests__/AnnotationCreation.test.js
babel.config.js 5 additions, 0 deletions

babel.config.js
nwb.config.js 6 additions, 6 deletions

nwb.config.js
package.json 9 additions, 13 deletions

package.json
setupJest.js 0 additions, 1 deletion

setupJest.js
src/AnnotationCreation.js 107 additions, 19 deletions

src/AnnotationCreation.js
src/AnnotationDrawing.js 36 additions, 18 deletions

src/AnnotationDrawing.js
src/TextEditor.js 14 additions, 1 deletion

src/TextEditor.js

with 182 additions and 61 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