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

623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Gilman
674c0a069d Fixed typos in comments 2013-05-20 09:40:17 -07:00
iangilman
da86ca2e38 Merge pull request #46 from houseofyin/issue37-navigator 
Issue37 navigator
 2013-05-20 09:38:49 -07:00
iangilman
096ba80d73 Merge pull request #94 from bgilbert/drawer-events 
Fix Drawer event emission
 2013-05-20 09:30:17 -07:00
houseofyin
bb4a8a0b4f Bringing back in sync with the latest baseline 2013-05-17 22:29:08 -04:00
Benjamin Gilbert
771b5443da test: Drop workaround for broken Drawer event emission 2013-05-17 01:26:21 -04:00
Benjamin Gilbert
fa1a8b2dde Fix Drawer event emission 
Drawer tries to emit events on the parent Viewer object but doesn't have
a reference to it.  Add a reference when constructing the Drawer.
 2013-05-16 02:49:29 -04:00
Ian Gilman
c78f3ef743 Fixed mislabeled JSDoc comment for OpenSeadragon.Viewer.prototype.open 2013-05-14 10:29:15 -07:00
Ian Gilman
2566b2f5cf Separated file JSDoc comment from root object JSDoc comment; fixes doc building 2013-05-14 10:28:44 -07:00
Ian Gilman
fd24106db9 Added in progress version to changelog 2013-05-14 09:55:19 -07:00
Ian Gilman
1118d41185 Updated version to 0.9.127 2013-05-14 09:53:34 -07:00
Ian Gilman
3eb233c35a Updated changelog 2013-05-14 09:38:11 -07:00
iangilman
0b366d7b42 Merge pull request #89 from bgilbert/license 
Revert to original New BSD license; clean up license declarations
 2013-05-14 09:15:00 -07:00
Ian Gilman
160da513cc Merge branch 'fullpage-class' of github.com:bgilbert/openseadragon into bgilbert-fullpage-class 
Fixed Conflicts:
	test/test.html
 2013-05-14 09:08:04 -07:00
Benjamin Gilbert
665ecd6655 Document New BSD license on @jpstroop's IIIF code 2013-05-14 00:20:35 -04:00
Benjamin Gilbert
fcc119bb84 Add file-specific descriptions to file headers 2013-05-14 00:00:24 -04:00
Benjamin Gilbert
7939fa7c4d Replace GitHub issue numbers with full URLs 2013-05-13 23:39:27 -04:00
Benjamin Gilbert
e50b9007b9 Move project URL above license URL in minified header 2013-05-13 23:37:23 -04:00
Benjamin Gilbert
17a6ee15b1 Include 2010 in "OpenSeadragon contributors" copyright dates 
This Git repository starts in 2011, but the CodePlex Mercurial repository
has commits from 2010.
 2013-05-13 23:32:09 -04:00
Benjamin Gilbert
fd04647b1b Test addition/removal of fullpage class on viewer element 2013-05-13 22:35:27 -04:00
Benjamin Gilbert
31d4cc13b7 Add tests for addClass/removeClass 2013-05-13 22:24:04 -04:00
Benjamin Gilbert
f235d7a642 Rename test/util.js to test/test.js 
since we are about to create a module for testing utility functions.
 2013-05-13 21:54:41 -04:00
Ian Gilman
ed87ceb23f Sped up animation for basic test 2013-05-13 10:57:16 -07:00
Ian Gilman
9001fe9a5e Generalized format test and added DZI XML 2013-05-13 10:50:43 -07:00
Ian Gilman
4182b5e5ba Made the distinction between using and developing on OpenSeadragon clearer 2013-05-13 10:31:42 -07:00
Ian Gilman
b3e8d98ec6 Updated changelog for #63 2013-05-13 10:20:57 -07:00
Benjamin Gilbert
99d6ff80b6 Add fullpage class to viewer element when in fullpage mode 
Closes #61.
 2013-05-12 23:02:18 -04:00
Benjamin Gilbert
522bcbf058 Add addClass()/removeClass() utility functions 2013-05-12 22:53:41 -04:00
Benjamin Gilbert
4e5393efe7 Drop executable bit from images 2013-05-12 21:51:47 -04:00
Benjamin Gilbert
56f5000d90 Document MIT license on John Dyer's fullscreen code 
See #81.
 2013-05-12 21:33:55 -04:00
Benjamin Gilbert
d80d928d80 Document New BSD license on seajax-utils OSM/TMS code 
@rsimon has given permission in #58 for the OSM/TMS code that originated
in seajax-utils to be released under the New BSD license.
 2013-05-12 18:07:20 -04:00
Benjamin Gilbert
c49de73692 Add license link to header of minified JS 2013-05-12 17:21:32 -04:00
Benjamin Gilbert
bbffa7a182 Fix inherited error in clause 3 of LICENSE file 
The original AJAX Control Toolkit license prohibited the name of the
CodePlex Foundation from being used to endorse/promote derived products.
We need to preserve this requirement.  This was already done in the .js
header blocks, and should have been done in LICENSE.txt in a7c96c56 but
was missed.

Original discussion in #10.  Permission for the license change was given
by all existing contributors in #58.
 2013-05-12 17:17:35 -04:00
Benjamin Gilbert
2f2eba8df2 Add "OpenSeadragon contributors" copyright statement 
The license text will be provided on the website, etc., and it seems
strange to list no copyright date newer than the original CodePlex
copyright from the AJAX Control Toolkit.  Add a blanket copyright
statement for contributions to the OpenSeadragon project, stating that
copyright is held by the authors of each contribution.  This blanket
statement is not intended to preclude individual contributors from
attaching their own copyright statements to their modifications.
 2013-05-12 17:12:26 -04:00
Benjamin Gilbert
ad9b66f3fb Add copyright statement to LICENSE.txt 
The license speaks of "the above copyright notice", so it would behoove
us to have one.
 2013-05-12 16:46:24 -04:00
Ian Gilman
69709a9666 Updated changelog 2013-05-10 12:04:09 -07:00
Ian Gilman
199c2f6c2d Merge branch 'master' of github.com:openseadragon/openseadragon 
Fixed Conflicts:
	test/test.html
 2013-05-10 11:59:09 -07:00
iangilman
980c2d23d6 Merge pull request #64 from heathn/getString-error 
Fix a problem with getString when the string property is a sub-property.
 2013-05-10 11:55:19 -07:00
Ian Gilman
b95d6540a1 Generalized test timeout code 2013-05-10 11:53:49 -07:00
Ian Gilman
457f908c06 DZI-JSONp test now works; enabled 2013-05-10 11:32:43 -07:00
Ian Gilman
c6f8b5e192 Fixed broken viewer.raiseEvent calls in drawer.js 2013-05-10 11:32:22 -07:00
Heath Nielson
eb14eae428 Merge remote branch 'upstream/master' into getString-error 
Conflicts:
	test/test.html
 2013-05-10 11:54:45 -06:00
iangilman
893c43244f Merge pull request #87 from bgilbert/compress 
Update to latest grunt-contrib-compress
 2013-05-10 10:26:43 -07:00
Benjamin Gilbert
52badbef36 Add MIT license blocks to src/openseadragon.js 
for code taken from jQuery and from mattsnider.com.

Ideally we'd keep the MIT-licensed helper code in a separate file,
but it proved difficult to extricate from the rest of openseadragon.js.

Also remove comment about plagiarism.  It's not plagiarism if it's
attributed and properly licensed.
 2013-05-10 00:57:49 -04:00
Benjamin Gilbert
f72aaeb903 Clean up LICENSE.txt formatting 2013-05-10 00:16:55 -04:00
Benjamin Gilbert
a7c96c56ef Drop MIT license; move BSD license to root directory 
All OpenSeadragon contributors have granted their permission for this
relicensing in #58.

Drop copyright statements for Ian Gilman and Christopher Thatcher as
they requested in #10.

Revert CodePlex Foundation copyright date to 2009 pursuant to discussion
in #10.
 2013-05-10 00:16:55 -04:00
Benjamin Gilbert
be20645876 Add BSD license block and CodePlex copyright to each source file 
See discussion in #10.
 2013-05-10 00:16:55 -04:00
Benjamin Gilbert
9d763c0984 Update to latest grunt-contrib-compress 2013-05-09 21:05:38 -04:00
Ian Gilman
c7105695db Added in progress version 2013-05-09 11:07:17 -07:00
Ian Gilman
8f20f3dae2 Upping version number to 0.9.126 2013-05-09 11:04:31 -07:00
Ian Gilman
05c25fddcf Getting started on a DZI-JSONp test; currently disabled 2013-05-09 11:03:31 -07:00