Commit Graph

2553 Commits

Author SHA1 Message Date
Ian Gilman
5196dc0450 Merge pull request #1278 from openseadragon/prevent
Fixed a problem with preventDefaultAction for the canvas-drag event
2017-08-04 10:06:09 -07:00
Ian Gilman
db79a6af1e Changelog for #1278 2017-08-03 10:49:52 -07:00
Ian Gilman
49ee98bbb0 Fixed a problem with preventDefaultAction for the canvas-drag event 2017-08-03 10:47:35 -07:00
Ian Gilman
a77ffd1133 Changelog for #1271 2017-08-01 13:11:09 -07:00
Ian Gilman
8d2d0552a2 Merge pull request #1271 from jetic83/master
different colors for different tiled images in debug mode.
2017-08-01 13:07:22 -07:00
Peter
910eaf6da6 changed indexOfImage to colorIndex 2017-07-31 17:43:10 -04:00
Peter
f268607b54 more colors for the default case and added documentation. 2017-07-31 17:36:25 -04:00
Peter
6265d389b9 remove BOM 2017-07-31 17:05:18 -04:00
Peter
175463a0f6 different colors for different tiled images in debug mode.
If there are multiple tiled images as overlay, it might be important to
see how they are loaded. Different colors in the debug mode for the
different tiledImages visualize that. DebugGridColors have to be given
as a sting array with a color for each tiledImage. However, shorter
arrays will be recycled without error. Also, single strings are treated
as single entry arrays, for backwards compatibility.
2017-07-26 10:57:17 -04:00
Peter
d8f761f509 Merge remote-tracking branch 'refs/remotes/openseadragon/master' 2017-07-26 10:39:20 -04:00
Ian Gilman
3d8a03c177 Merge pull request #1258 from dlong500/installfromgithub
Compatibility with direct npm/yarn installation from Github forks/branches
2017-07-20 10:19:09 -07:00
Ian Gilman
bb8631bbe8 Merge pull request #1259 from openseadragon/ian
Fixed doc comments for 2.3.0
2017-07-18 16:58:27 -07:00
Ian Gilman
b0ed8444c1 Removed Doc comment for OpenSeadragon function 2017-07-18 16:39:43 -07:00
Ian Gilman
ca4550d76e Doc comment fixes 2017-07-18 16:22:26 -07:00
Davison Long
1d70f86ca1 add documentation for installing from Github forks/branches 2017-07-17 20:23:53 -04:00
Davison Long
3dec5bb98a make project compatible with direct npm/yarn installation from github repo 2017-07-17 19:38:18 -04:00
Ian Gilman
b49fef332c Next version number 2017-07-14 16:48:16 -07:00
Ian Gilman
e4fd781199 Updated grunt compress so it would make tars properly 2017-07-14 16:46:55 -07:00
Ian Gilman
bc6e20e62f Version 2.3.0 2017-07-14 16:15:54 -07:00
Ian Gilman
285f22d84c Merge branch 'master' of github.com:openseadragon/openseadragon 2017-07-14 16:04:43 -07:00
Ian Gilman
8195b3835c Updated changelog for release 2017-07-14 16:04:23 -07:00
Ian Gilman
e37a73824d Merge pull request #1249 from openseadragon/ian
More forgiving check for DZI schema
2017-07-13 17:21:19 -07:00
Ian Gilman
65b41c3f6e Looser check for DZI schema 2017-07-13 17:16:13 -07:00
Ian Gilman
356ea78b26 Changelog for #1071 2017-07-13 17:05:47 -07:00
Ian Gilman
62bc9e7958 Merge branch 'thejohnhoffer-master' 2017-07-13 17:00:28 -07:00
Ian Gilman
d2c58c43aa Removed Boolean constructor from pre-load patch 2017-07-13 16:56:09 -07:00
Ian Gilman
e8971b2940 Merge branch 'master' of https://github.com/thejohnhoffer/openseadragon into thejohnhoffer-master 2017-07-13 16:53:43 -07:00
Ian Gilman
1f85a811e9 Changelog for #1244 2017-07-12 16:04:37 -07:00
Ian Gilman
28f9e9e35e Merge pull request #1244 from LarissaSmith/master
Fix more issues with tracking multiple pointers.
2017-07-12 16:00:38 -07:00
Ian Gilman
0bbb7c336d Merge pull request #1246 from openseadragon/ig-constraints
Updated viewport.getConstrainedBounds so it takes in `current`
2017-07-12 15:59:57 -07:00
Ian Gilman
969faaab23 Merge pull request #1193 from openseadragon/ig-loading
No longer loading too many tiles
2017-07-12 15:59:15 -07:00
Ian Gilman
6282a9b717 Changelog for #1245 2017-07-12 15:36:44 -07:00
Ian Gilman
d8b0aae823 Merge pull request #1245 from gehan/master
Fix for #1232 - constrainDuringPan causes jitter on mobile
2017-07-12 15:35:22 -07:00
larissasmith
0bded9f8e1 Correct docs and add check for contact count. 2017-07-12 11:21:52 -06:00
larissasmith
21f103e95d Revert "Update event assertions."
This reverts commit fd15789f6f.
2017-07-12 11:13:10 -06:00
Gehan Gonsalkorale
76f5a0ed33 Fix for #1232 - constrainDuringPan causes jitter on mobile 2017-07-11 22:39:01 +01:00
Ian Gilman
6600aca3e4 Removing debug code 2017-07-11 13:41:40 -07:00
Ian Gilman
4320f2d6c8 Merge branch 'master' into ig-loading 2017-07-11 13:40:51 -07:00
Ian Gilman
97c839b9f3 Updated viewport.getConstrainedBounds so it takes in current instead of immediately 2017-07-11 13:25:58 -07:00
Ian Gilman
4e060d6ca2 Changelog for #1133 2017-07-11 13:11:15 -07:00
Ian Gilman
41b9cc647b Merge pull request #1133 from josmilmed/master
Patch to fix issue #697
2017-07-11 13:08:35 -07:00
Ian Gilman
fd502dbdab Changelog for #1241 2017-07-11 11:53:41 -07:00
Ian Gilman
31bee4028f Merge pull request #1241 from VipSaran/master
fix for #1209 (Reference strip using "thumbs")
2017-07-11 11:50:47 -07:00
Jose
aabfa32595 Merge conflict resolved 2017-07-10 23:01:04 +02:00
larissasmith
c3a65bab38 Replace filter with a for loop. 2017-07-10 13:54:20 -06:00
Robert Saric
57103a5dd4 fix for #1209 (Reference strip using "thumbs") additional changes 2017-07-10 20:19:13 +02:00
larissasmith
fd15789f6f Update event assertions. 2017-07-07 17:21:01 -06:00
larissasmith
d9bda20e59 Fix more issues with tracking multiple pointers. 2017-07-07 16:50:03 -06:00
Robert Saric
413e40a64c fix for #1209 (Reference strip using "thumbs") 2017-07-06 21:59:26 +02:00
Ian Gilman
2419a0111a Merge branch 'master' into ig-loading 2017-07-06 10:06:07 -07:00