Commit Graph

279 Commits

Author SHA1 Message Date
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
Ian Gilman
ae3b100483 Merge branch 'collections' into m2 2015-01-22 11:16:09 -08:00
Ian Gilman
735fcc3e37 Merge branch 'master' into collections
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
2015-01-22 11:15:45 -08:00
Mark Salsbery
c2ebbbe1af Merge branch 'master' into viewer_focus
Conflicts:
	changelog.txt
2015-01-21 14:59:41 -08:00
Mark Salsbery
a09b6837d3 changelog update 2015-01-21 12:49:45 -08:00
Mark Salsbery
b639f1e168 changelog update 2015-01-21 11:51:56 -08:00
Mark Salsbery
1da57564df Merge branch 'master' into mousetracker_defaulton
Conflicts:
	changelog.txt
	src/navigator.js
2015-01-21 11:18:52 -08:00
Mark Salsbery
2fd2da465b Merge branch 'master' into navigator_disable
Conflicts:
	changelog.txt
2015-01-21 09:38:40 -08:00
Mark Salsbery
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Mark Salsbery
269f9ee71d changelog update 2015-01-20 17:45:13 -08:00
Ian Gilman
2172da6aaa * Fixed an error in fitBounds that occurred sometimes with immediately = true 2015-01-20 17:19:13 -08:00
Mark Salsbery
1151a9343e Merge branch 'master' into navigator_disable
Conflicts:
	changelog.txt
2015-01-20 14:01:45 -08:00
Mark Salsbery
912f82d36d IE 11 fix and Merge branch 'master' into mousetracker_MSPointerEvent
Conflicts:
	changelog.txt
2015-01-20 13:28:30 -08:00
Ian Gilman
897a237807 Added viewport-change event; fixed spring reset 2015-01-20 11:23:34 -08:00
Mark Salsbery
198d4de0e6 Added setMouseNavEnabled() and isMouseNavEnabled() method overrides to Navigator (#572) 2015-01-20 11:01:09 -08:00
Mark Salsbery
3b01014ac8 Fixed pointer event model detection for IE 10 (#571) 2015-01-20 10:26:14 -08:00
Mark Salsbery
7c39794bd9 changelog update 2015-01-20 09:52:18 -08:00
Ian Gilman
732cd87a10 Merge branch 'collections' into m2
fixed Conflicts:
	changelog.txt
2015-01-19 10:45:26 -08:00
Ian Gilman
dc1a7c9cc5 Merge branch 'master' into collections
fixed Conflicts:
	src/viewer.js
2015-01-19 10:35:31 -08:00
Ian Gilman
2bd105042a Changelog for #537 2015-01-19 10:31:30 -08:00
Mark Salsbery
b5b4131f49 changelog update 2015-01-17 11:21:16 -08:00
Mark Salsbery
412ebce94d Keyboard navigation fixes
Removed textarea element from Viewer DOM. Viewer.canvas now handles keyboard navigation.
2015-01-17 11:18:55 -08:00
Mark Salsbery
abacc50820 changelog update 2015-01-16 16:31:23 -08:00
Ian Gilman
c55daff222 Merge pull request #553 from openseadragon/ajax
Allowing XHRs withCredentials for authenticated requests
2015-01-15 14:35:06 -08:00
Mark Salsbery
3d8ddcf1ff changelog update 2015-01-15 12:18:35 -08:00
Ian Gilman
3232ba4fe5 * Fixed an error in fitBounds if the new and old bounds were extremely close in size 2015-01-14 17:06:18 -08:00
Mark Salsbery
960b4a0d14 changelog update 2015-01-14 08:46:06 -08:00
Ian Gilman
e4c3dfc8dd Added Rect.union; allowed minZoomLevel greater than home zoom 2015-01-13 15:31:52 -08:00
Ian Gilman
ef20ccc1e7 Merge branch 'collections' into m2 2015-01-13 14:12:14 -08:00
Ian Gilman
17b8f356ed Merge branch 'master' into collections 2015-01-13 14:11:52 -08:00
Ian Gilman
aa735c1e00 Changelog fix 2015-01-13 09:27:39 -08:00
Ian Gilman
373631ae32 Merge branch 'collections' into m2 2015-01-12 16:47:39 -08:00
Mark Salsbery
e4c549927b Merge remote-tracking branch 'upstream/master' into mousebuttons479
Conflicts:
	changelog.txt
2015-01-12 15:36:19 -08:00
Ian Gilman
a411215eba Merge branch 'master' into collections
fixedConflicts:
	src/openseadragon.js
2015-01-12 14:31:20 -08:00
Ian Gilman
00edbe565a Changelog for #563 2015-01-12 14:21:57 -08:00
Ian Gilman
0fd94bb048 Merge branch 'master' into collections
fixed Conflicts:
	changelog.txt
	src/viewer.js
2015-01-12 14:10:49 -08:00
Ian Gilman
7b6f7d6a5b Changelog for #561 2015-01-12 13:40:33 -08:00
Mark Salsbery
ad838e7fd4 changelog update 2015-01-10 14:51:56 -08:00
Mark Salsbery
30b5ec04c6 MouseTracker Improvements
* Exposed secondary pointer button (middle, right, etc.) events from MouseTracker and through viewer (#479)
* MouseTracker - Improved IE 8 compatibility
2015-01-10 14:49:02 -08:00
Ian Gilman
4fa6fea850 Scrollwheel for thumbs (m2) 2015-01-09 11:45:53 -08:00
Ian Gilman
8ff70dd54f Started 1.2.1 2015-01-05 13:21:19 -08:00
Ian Gilman
d694c7ea6c Version bump 2015-01-05 13:17:05 -08:00
Ian Gilman
a336b23667 Documentation for ajaxWithCredentials-related changes 2015-01-02 16:07:11 -08:00
Ian Gilman
56ee5bd3c5 Viewport and tiledImage test fixes 2015-01-02 14:24:05 -08:00
Ian Gilman
48eaf7c805 Merge branch 'master' into collections 2014-12-31 15:17:43 -08:00
Mark Salsbery
05ba23ea55 changelog update - added PR # 2014-12-31 14:41:27 -08:00
Mark Salsbery
49e1a8b8e2 changelog update 2014-12-31 14:39:37 -08:00
Ian Gilman
0edef40db2 Merge branch 'master' into collections 2014-12-31 11:13:27 -08:00
Ian Gilman
3e76bfdd9e Changelog for #518 2014-12-31 11:08:06 -08:00
Ian Gilman
6a7f56d858 tiledImage bounds animation now works 2014-12-02 11:44:02 -08:00
Ian Gilman
68fbdc7beb * Overlays appear in the DOM immediately on open or addOverlay (#507) 2014-11-20 15:33:13 -08:00
Ian Gilman
643332902d Unit tests for World 2014-11-17 16:24:40 -08:00
Ian Gilman
f018059b60 Docs for sequence mode 2014-11-17 11:50:20 -08:00
Ian Gilman
cccee8bdf1 Changelog 2014-11-14 15:54:41 -08:00
Ian Gilman
1ed80b0d27 Docs and naming changes for collection mode 2014-11-12 16:31:46 -08:00
Ian Gilman
55759a6906 Merge branch 'master' into collections 2014-11-10 14:39:43 -08:00
Ian Gilman
d6853b9d6d Merge branch 'master' into SupplyFrame-issue-464
fixed Conflicts:
	changelog.txt
2014-11-10 09:36:30 -08:00
Ian Gilman
30a1005fb8 Merge branch 'master' into merger
fixed Conflicts:
	src/drawer.js
2014-11-07 17:13:48 -08:00
Ian Gilman
6306c4af19 Changelog for #409 2014-11-07 16:11:10 -08:00
Ian Gilman
1366bb7abe Touch-ups for #481 2014-11-07 16:07:04 -08:00
Ian Gilman
d346d165f8 Updated documentation 2014-11-04 11:53:39 -08:00
Ian Gilman
ab33d984d3 More unit test fixes 2014-11-04 09:38:16 -08:00
Ian Gilman
63996a7d92 Merge branch 'master' into collections
fixed Conflicts:
	src/viewport.js
2014-09-17 16:05:23 -07:00
Ian Gilman
8f016f97f9 Changelog for #474 2014-09-15 13:30:07 -07:00
Ian Gilman
5a1a41428b Merge branch 'master' into collections
fixed Conflicts:
	src/drawer.js
2014-08-26 11:53:03 -07:00
Ian Gilman
bcb16de02b Changelog for #466 and #468 2014-08-26 10:49:10 -07:00
Ian Gilman
3dcf4cad57 Added changelog for multi-image 2014-08-21 10:44:32 -07:00
Ian Gilman
8efad6f3a0 Fixed home/constraints for multi-image. 2014-08-18 16:04:49 -07:00
Ian Gilman
ac7e0878e1 Changelog for #455 2014-08-15 10:00:57 -07:00
Ian Gilman
e5ae54ee61 Changelog for #462 2014-08-15 09:30:43 -07:00
Ian Gilman
e1dde133e1 Changelog for #453 2014-08-08 11:31:48 -07:00
Ian Gilman
bf75405c39 Changelog for #452 2014-08-07 10:05:01 -07:00
Mark Salsbery
94f7ca3b66 Changelog update 2014-08-06 11:38:43 -07:00
Ian Gilman
1743686d84 Updated changelog and gitignore. 2014-07-30 09:25:40 -07:00
Rob Sanderson
8a6a111698 Documentation and © fix 2014-07-29 11:12:05 -07:00
Ian Gilman
4f8b5d6704 Changelog for #423 2014-07-24 09:31:17 -07:00
Ian Gilman
d7e53af27b Changelog for #421 2014-06-19 09:14:24 -07:00
Ian Gilman
e967b3c7a3 Changelog for #413 2014-06-02 09:10:22 -07:00
Ian Gilman
6467c0d0e9 In progress 1.1.2 2014-05-08 09:33:52 -07:00
Ian Gilman
9aa0f323db Releasing 1.1.1 2014-05-08 09:30:03 -07:00
Ian Gilman
378bfb9532 Changelog for #395 2014-05-05 10:06:10 -07:00
Ian Gilman
2f9b3091c9 Added 1.1.1 to changelog 2014-04-30 10:39:44 -07:00
Ian Gilman
3b36277940 Updated for 1.1.0 release 2014-04-30 10:34:25 -07:00
Mark Salsbery
8232546d51 Merged upstream changes, fixed conflicts 2014-04-24 12:40:49 -07:00
Ian Gilman
7a8a7b2221 Changelog for #379 2014-04-24 10:06:03 -07:00
Mark Salsbery
e900b605af Update changelog.txt
Updated changelog.

Misc documentation fixes.
2014-04-22 09:41:29 -07:00
Mark Salsbery
c2e7b376b0 pinchToZoom gesture option added, misc. fixes
changelog update.
pinchToZoom gesture option added.
Event unit tests cleaned up.
2014-04-15 19:19:47 -07:00
Mark Salsbery
9b15ca090b Fallback to mouseover/mouseout, 2014-04-15 13:04:08 -07:00
Mark Salsbery
e8e0f28f5a Merge Upstream Changes 2014-04-15 06:40:46 -07:00
Mark Salsbery
09bfd55add MouseTracker fixes and tests
Separated event-model/device specific event handling code from
event-model/device agnostic event handling code.
Use enter/leave events instead of over/out events.
Updated unit tests for above changes.
Added unit tests for mouse gestures.
Updated changelog for breaking changes and deprecations.
2014-04-14 18:17:18 -07:00
Ian Gilman
c298b89b64 Changelog for #378 2014-04-14 09:13:05 -07:00
Ian Gilman
5dafa32f5d Changelog for #376 and spelling fix 2014-04-09 09:06:46 -07:00
Ian Gilman
a4f10e3b3a Changelog for #377 2014-04-08 14:38:52 -07:00
Ian Gilman
5af723d937 Changelog for #375 2014-04-08 14:38:51 -07:00
Mark Salsbery
642c302225 Changelog, documentation, options update 2014-04-03 10:06:12 -07:00
Mark Salsbery
dc48a31412 Exposed gesture settings as options 2014-04-03 08:50:25 -07:00
Ian Gilman
f18909d0ec Bumped upcoming version number because of breaking changes 2014-03-27 09:09:53 -07:00
Antoine Vandecreme
009b75393f Remove ActiveX for IE<11. Update changelog. 2014-03-25 11:34:46 -04:00