Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.1.3 #1249

Merged
merged 86 commits into from
Feb 9, 2017
Merged

2.1.3 #1249

merged 86 commits into from
Feb 9, 2017

Conversation

rsinghal
Copy link
Collaborator

@rsinghal rsinghal commented Feb 9, 2017

No description provided.

radpet and others added 30 commits November 22, 2016 19:21
@radpet
Add default link target to blank
178d348
@tomcrane
If canvas.thumbnail is level 0, don't use
cc74436
@jbaiter
Use jsonLd.getTextValue for attribution to support localization and m…
f1bbb49 
…ultiple values
@jbaiter
Remove illegal HTML elements in JsonLd.getTextValue
7bc61eb
@jbaiter
Add missing semicolon
985b9f7
@jbaiter
Fix typo in list of allowed tags (emph -> em)
134afcd
@jbaiter
Rename emph to em in tests
e9efe88
@rsinghal
Merge pull request #1206 from radpet/bugfix/add_default_link_target
4f77c2f 
Add default link target to blank
@rsinghal
Merge branch '2.1.3' into check-compliance-for-thumbnail
010b81f
@rsinghal
Merge branch '2.1.3' into sanitize-html
72ccee2
@rsinghal
Merge pull request #1211 from dbmdz/sanitize-html
cf97d05 
Sanitize HTML in Manifest according to specification
@rsinghal
Merge branch '2.1.3' into check-compliance-for-thumbnail
5abfd57
@radpet
Update paper js version
2c9ca61 
Add workaround for paper.js shape fill color because it does not detect mouse cursor on shapes with transparent fill color
@radpet
Merge branch '2.1.3' into bugfix/annotations_crash_chrome55_#1212
303a896
@jbaiter
Allow duplicate metadata keys
04b7268
@kbois
fix arguments in the publish event 'ADD_MANIFEST_FROM_URL'
8f64307
@kbois
Update ManifestsPanel test
07f7e29
@radpet
Properly remove slot when destroyed
72b4451 
Fire the events with the correct window.id
@mikeapp
Changes YCBA manifests to HTTPS per #1220
adf5712
@dicksonlaw583
Added annotation strategies with tests
a32ca54
@dicksonlaw583
Replaced annotation building calls with strategy calls in osd-svg-ove…
63d197d 
…rlay.js and osd-region-draw-tool.js.
@dicksonlaw583
Renamed confusing variable declaration that looks like overwriting th…
cf70959 
…e global window
@dicksonlaw583
Added method descriptions to each formatting strategy
e781013
@rsinghal
Merge pull request #1221 from mikeapp/2.1.3
b580fc5 
Changes YCBA manifests to HTTPS per #1220
@rsinghal
Merge branch '2.1.3' into bugfix/properly_remove_slots_#1217
2b83a67
@rsinghal
Merge pull request #1218 from radpet/bugfix/properly_remove_slots_#1217
705edc3 
Properly remove slot when destroyed
@rsinghal
Merge branch '2.1.3' into 2.1.3
992c08c
@rsinghal
Merge pull request #1215 from kbois/2.1.3
5226921 
fix arguments in the publish event 'ADD_MANIFEST_FROM_URL'
@rsinghal
Merge pull request #1214 from radpet/bugfix/annotations_crash_chrome5…
bb5aa68 
…5_#1212

Update paper js version
@rsinghal
Merge branch '2.1.3' into check-compliance-for-thumbnail
67232c0
rsinghal and others added 27 commits January 11, 2017 15:10
@rsinghal
Merge pull request #1229 from dbmdz/fix/metadata-link-target
b4248b4 
Fix in metadata links not having target="_blank"
@rsinghal
some hacky code to work with the new dual strategy and reintroduce th…
99f625b 
…umbnail using xywh
@rsinghal
pass in xywh bounds
aff62b5
@rsinghal
publish when dialog box is created
9d71838
@rsinghal
remove events
8804a17
@rsinghal
use dual strategy when building out the OA from catch
54cd956
@rsinghal
use correct function to create thumbnail url and account for annotati…
56c5849 
…on strategies when converting catch to OA
@rsinghal
correctly handle arrays in config
07d9d35
@rsinghal
pass data back for update
8945202
@rsinghal
use region, not full for image url
10b0fad
@rsinghal
change when annotationEditorAvailable is published so it happens afte…
a92570f 
…r the editor is in the DOM
@knagasaki
Update translation.json
bd4858d
@rsinghal
Update version number
e3d8ac0
@aeschylus
Update CONTRIBUTING.md
09b73d4
@rsinghal
Update CONTRIBUTING.md
099324d
@rsinghal
added params as an option for catch
0b85d99
@rsinghal
needs to be this.params
a839950
@rsinghal
Change miradorDualStrategy to account for multiple targets according …
e76a1ce 
…to OA model. Adjust localStorageEndpoint and catchEndpoint to handle these changes
@rsinghal
fix structure of annotation to reflect dualStrategy model
ef51798
@rsinghal
use _this instead of this
3e51520
@rsinghal
use _this instead of this
8fbe99b
@rsinghal
one more
178829b
@rsinghal
make sure to parse strings as ints
b6fa574
@rsinghal
Merge branch '2.1.3' into catch_annotation_fixes
6961334
@rsinghal
Merge pull request #1248 from ProjectMirador/catch_annotation_fixes
31aa245 
Catch annotation fixes
@rsinghal
Merge branch '2.1.3' into patch-4
5d2232d
@rsinghal
Merge pull request #1242 from knagasaki/patch-4
9cc1954 
Update translation.json
@rsinghal rsinghal merged commit 993b08e into master Feb 9, 2017
@coveralls
Copy link

Coverage Status

Coverage increased (+0.2%) to 61.463% when pulling 9cc1954 on 2.1.3 into a4a7108 on master.

@rsinghal rsinghal deleted the 2.1.3 branch February 9, 2017 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.