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.

aff24731

Unverified Commit aff24731 authored Nov 6, 2017 by Matthias Lindinger Committed by GitHub Nov 6, 2017

Downloads
- Plain Diff

Merge branch 'develop' into minor-ui-improvement

parents edccddc5 8ea48886

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

Gruntfile.js 2 additions, 32 deletions

Gruntfile.js
README.md 9 additions, 7 deletions

README.md
bin/create_release.sh 12 additions, 6 deletions

bin/create_release.sh
bin/update_demo.sh 2 additions, 1 deletion

bin/update_demo.sh
js/src/annotations/osd-region-draw-tool.js 2 additions, 0 deletions

js/src/annotations/osd-region-draw-tool.js
js/src/annotations/simpleASEndpoint.js 107 additions, 78 deletions

js/src/annotations/simpleASEndpoint.js
package.json 3 additions, 1 deletion

package.json
spec/annotations/simple-as-endpoint.test.js 2 additions, 2 deletions

spec/annotations/simple-as-endpoint.test.js

with 139 additions and 127 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