1325 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ian Gilman	9ebdaee326	Merge branch 'collections' into ian	2014-11-10 14:40:12 -08:00
Ian Gilman	55759a6906	Merge branch 'master' into collections	2014-11-10 14:39:43 -08:00
Ian Gilman	37016e468c	Merge branch 'SupplyFrame-issue-464'	2014-11-10 09:37:58 -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	dbf7a0477a	Merge branch 'collections' into ian	2014-11-07 17:16:05 -08:00
Ian Gilman	7fcdbf210e	One extra merge conflict	2014-11-07 17:15:11 -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	b15b94799c	Merge branch 'issue-464' of github.com:SupplyFrame/openseadragon into SupplyFrame-issue-464	2014-11-07 15:48:57 -08:00
Ian Gilman	ffac82ce60	Merge branch 'rdlester-imageLoaderPatch'	2014-11-07 15:33:27 -08:00
Ian Gilman	fab33ea1af	Merge branch 'imageLoaderPatch' of github.com:rdlester/openseadragon into rdlester-imageLoaderPatch ... fixed Conflicts: src/drawer.js	2014-11-07 15:29:34 -08:00
Ian Gilman	3a902a7768	Testing overlays	2014-11-05 16:54:03 -08:00
Ian Gilman	5954fc632d	Merge pull request #517 from openseadragon/ian ... Continuing collections work	2014-11-05 16:44:33 -08:00
Ian Gilman	b5a9116a0b	Fixed rotation with multiple images	2014-11-05 16:39:35 -08:00
Ian Gilman	8bdc55bd63	Fixed fitVertically and fitHorizontally	2014-11-05 15:57:44 -08:00
Ian Gilman	a9c9478752	Wraparound now works for images of other widths than 1	2014-11-05 15:24:31 -08:00
Ian Gilman	e52e2fef34	Improved docs	2014-11-05 14:48:37 -08:00
Ian Gilman	8641279890	Better tile caching for duplicate images	2014-11-05 13:48:27 -08:00
Ian Gilman	8466a91470	One more doc fix	2014-11-04 11:57:58 -08:00
Ian Gilman	d346d165f8	Updated documentation	2014-11-04 11:53:39 -08:00
Ian Gilman	fd601f1463	Merge pull request #509 from openseadragon/ian ... New open() API for collections	2014-11-04 09:59:30 -08:00
Ian Gilman	31c15aed69	Merge branch 'collections' into ian ... fixed Conflicts: src/viewer.js test/demo/collections/main.js	2014-11-04 09:58:09 -08:00
Ian Gilman	b730ebbe83	Merge pull request #505 from openseadragon/margins ... Viewport margins	2014-11-04 09:44:36 -08:00
Ian Gilman	43292c9bcb	Merge branch 'collections' into margins	2014-11-04 09:42:45 -08:00
Ian Gilman	de2d473db6	Merge branch 'master' into collections ... fixed Conflicts: test/test.html	2014-11-04 09:41:28 -08:00
Ian Gilman	ab33d984d3	More unit test fixes	2014-11-04 09:38:16 -08:00
Ian Gilman	00c2881c64	Fixed test breakages	2014-11-03 17:14:17 -08:00
Ian Gilman	20d3571a8a	Merge pull request #506 from nein09/viewport-tests ... Viewport tests - here's what I have so far.	2014-11-03 11:25:11 -08:00
Ian Gilman	f8156991ef	More doc tweaks	2014-10-29 17:23:54 -07:00
Ian Gilman	a68be6ac68	You can now open multiple images when creating via OpenSeadragon()	2014-10-29 17:14:46 -07:00
Ian Gilman	72aa6c4669	Docs for Viewer.open()	2014-10-29 17:06:14 -07:00
Ian Gilman	4d6be50c05	More cleanup for open() changes	2014-10-29 16:39:43 -07:00
Ian Gilman	95836a6ad1	Major overhaul to Viewer.open()	2014-10-29 16:11:21 -07:00
Ian Gilman	3810916577	Added --min option for grunt watch	2014-10-29 16:01:06 -07:00
nein09	19844c8f42	Incorporate code review feedback, add a times method to the Rect class.	2014-10-29 09:42:19 -07:00
nein09	e0fbf869c9	Replace more magic numbers with constants.	2014-10-27 18:06:37 -07:00
nein09	2d70ee32fc	Remove randomness from test cases.	2014-10-27 17:58:59 -07:00
Ben Delarre	61d757e86b	Merge branch 'master' into issue-465	2014-10-27 14:07:10 -07:00
Ian Gilman	fb6280644a	Merge branch 'collections' into margins ... fixed Conflicts: test/demo/collections/main.js	2014-10-24 15:27:14 -07:00
Ian Gilman	817536929d	Merge pull request #488 from openseadragon/ian ... WIP: collections plus navigator	2014-10-24 15:22:09 -07:00
Ian Gilman	3e1870cde0	Navigator now updates for item index changes and removals	2014-10-24 15:18:32 -07:00
nein09	c1ae3d08f7	More constants, fewer magic numbers.	2014-10-23 16:30:34 -07:00
nein09	72a0ecc195	Force a zoom factor of 2 and make that a constant; find the viewer position in the window for imageToWindowCoordinates (still not sure where the 20 x 20 pixel padding is coming from	2014-10-23 16:13:02 -07:00
Ian Gilman	46cd2ab800	Fixed issue with top/left margins; cleaned up naming	2014-10-21 17:11:09 -07:00
nein09	8494b7ee7f	Take out multiplication to avoid precision errors because it doesn't; add viewportToImageRectangle test	2014-10-21 11:19:41 -07:00
nein09	7cf4556cdc	Merge remote-tracking branch 'origin/master' into viewport-tests	2014-10-20 15:43:21 -07:00
nein09	69143f786b	Fix a bad merge of changelog.txt	2014-10-20 15:41:51 -07:00
Ian Gilman	a14bea39aa	More margins work	2014-10-17 14:27:24 -07:00
Ian Gilman	afc488cecf	Merge pull request #501 from gitter-badger/gitter-badge ... Add a Gitter chat badge to README.md	2014-10-17 10:21:32 -07:00