mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 13:16:10 +03:00
Code Issues Projects Releases Wiki Activity
1,528 Commits 12 Branches 28 Tags 35 MiB
22bfbac916
Commit Graph

1528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edsilv
22bfbac916 Merge remote-tracking branch 'upstream/master' 2015-02-21 11:36:43 +00:00
Ian Gilman
4a3899e394 Merge pull request #603 from openseadragon/m2 
Demos of alternates and details in non-Harvard version (m2)
 2015-02-16 10:47:23 -08:00
Ian Gilman
2cd54648f0 Demos of alternates and details in non-Harvard version (m2) 2015-02-16 10:45:46 -08:00
Ian Gilman
4e074cde32 Merge pull request #602 from openseadragon/m2 
M2 demo: detail view
 2015-02-16 10:22:47 -08:00
Ian Gilman
70e08a02ce Positioning alternates better (m2) 2015-02-16 10:18:59 -08:00
Ian Gilman
725bc36c4e Detail view (m2) 2015-02-13 15:55:57 -08:00
Ian Gilman
de18b3dc63 Refactoring (m2) 2015-02-13 14:32:17 -08:00
Ian Gilman
a76b92d0a7 Merge pull request #601 from openseadragon/preserve 
Minor preserveOverlays cleanup
 2015-02-13 13:31:46 -08:00
Ian Gilman
f118ae9407 Minor preserveOverlays cleanup 2015-02-13 13:26:44 -08:00
Ian Gilman
384e0d4782 Merge pull request #597 from avandecreme/master 
Fixed Firefox 35 not able to open local files (#588)
 2015-02-11 08:58:23 -08:00
Antoine Vandecreme
6662001aae Fixed Firefox 35 not able to open local files (#588) 2015-02-10 18:28:05 -05:00
Ian Gilman
32fa3fc13f Merge pull request #596 from openseadragon/m2 
More on m2 demo (alternate images) including a multi-image open() bug fix
 2015-02-10 14:14:53 -08:00
Ian Gilman
ae7adad5cf Alternate images (m2) 2015-02-10 14:02:41 -08:00
Ian Gilman
5443eedebc Fixed positioning issue when going to book mode with tall images (m2) 2015-02-10 11:53:56 -08:00
Ian Gilman
f531a18531 Fixed mouse positioning (m2) 2015-02-10 11:42:36 -08:00
Ian Gilman
88c488d706 For multi-image open, drawing isn't started until all tileSources have been opened 2015-02-10 11:30:36 -08:00
Ian Gilman
9c2dda6991 Changelog for #595 2015-02-10 10:42:32 -08:00
Ian Gilman
df73e1516a Merge pull request #595 from Jondeen/master 
Fixed x/y typo in reference strip.
 2015-02-10 10:40:13 -08:00
edsilv
4d8ab41808 remove show/hide controls 2015-02-09 21:29:17 +00:00
edsilv
1f494b16d1 Merge branch 'ed' 2015-02-09 21:19:07 +00:00
Jonas Daniel
f5f6ee5831 Fixed x/y typo in reference strip. 
Typo caused horizontal strip to be rendered only relative to height, not to width as it should. On typical landscape sized screens this forced only ~half the reference strip to be (pre-)rendered at any time.
 2015-02-09 21:19:30 +01:00
Ian Gilman
07027275a1 Updated changelog 2015-02-09 11:03:27 -08:00
Ian Gilman
3842779746 Merge pull request #446 from openseadragon/collections 
Collections
 2015-02-09 10:42:10 -08:00
Ian Gilman
7d3dfd810f Merge pull request #590 from openseadragon/tests 
Fixes for viewport tests with collections
 2015-02-09 10:38:51 -08:00
Ian Gilman
20443e30f1 Fixes for viewport tests with collections 2015-02-09 10:36:07 -08:00
Ian Gilman
6cb08a8b58 Merge branch 'master' into collections 2015-02-09 10:18:30 -08:00
Ian Gilman
0e67b9c204 Added TODO marker for #589 2015-02-09 09:24:43 -08:00
Ian Gilman
76e99a246f Merge pull request #570 from nein09/viewport-tests 
The last of the viewport tests.
 2015-02-09 09:13:58 -08:00
nein09
449e80bf24 Fix the viewport bounds for fitBoundsWithConstraints 2015-02-08 22:46:55 -08:00
edsilv
c5a8074b1e ignore .idea files, added show/hide controls methods 2015-02-06 13:58:13 +00:00
Ian Gilman
4bf40bffc1 Merge branch 'master' into collections 2015-02-05 14:46:43 -08:00
Ian Gilman
edc04df5bd Changelog for #586 2015-02-05 09:12:27 -08:00
Ian Gilman
dfe465f79e Merge pull request #586 from jpstroop/iiif_use_full 
Correct IIIF tile source to use canonical syntax
 2015-02-05 09:09:36 -08:00
Ian Gilman
425d78ddb4 Merge pull request #585 from openseadragon/m2 
M2 demo
 2015-02-04 10:26:48 -08:00
Ian Gilman
5161793948 m2 readme 2015-02-04 10:23:24 -08:00
Ian Gilman
80d8d2e96f Prepped m2 demo for merging 2015-02-04 10:18:36 -08:00
Ian Gilman
1e8731a2ba Merge branch 'collections' into m2 
Fixed Conflicts:
	changelog.txt
 2015-02-04 09:35:20 -08:00
Ian Gilman
20abed27bd Changelog for #583 2015-02-04 09:33:25 -08:00
Ian Gilman
bd1dad7829 Merge pull request #583 from wesleyfok/collections 
WIP basic high pixel density support re: openseadragon/openseadragon#541
 2015-02-04 09:10:50 -08:00
Wesley Fok
65c8ed6f36 drawDebugInfo is now high-dpi aware 2015-02-03 14:45:39 -05:00
Jon Stroop
32338efe32 wasn't using canonical syntax 2015-02-03 10:14:46 -05:00
nein09
ed0ffb14cf Change the fitBoundsWithConstraints test according to feedback (I think) 2015-02-01 23:29:30 -08:00
nein09
8ce77c51fb Merge branch 'master' into viewport-tests 2015-02-01 22:14:43 -08:00
Wesley Fok
b67cf2aa08 Fixed tile image canvas being too large 2015-01-30 16:40:34 -05:00
Wesley Fok
832ba62df0 Remove unneeded $.console.log calls 2015-01-30 16:03:45 -05:00
Wesley Fok
28ddf5a809 Backed out old coordinate translation modifications, moving pixel density check to rendering code 2015-01-30 15:46:52 -05:00
Ian Gilman
a494cc8a58 Merge branch 'master' into collections 
Fixed Conflicts:
	changelog.txt
 2015-01-30 09:43:55 -08:00
Ian Gilman
0b5b776db6 Starting next version 2015-01-29 13:20:56 -08:00
Ian Gilman
2f9563d58c Version bump 2015-01-29 13:10:59 -08:00
Wesley Fok
a23da44b8f Clean up $.pixelDensityRatio comments 2015-01-29 15:14:41 -05:00