188 Commits

Author	SHA1	Message	Date
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
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	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