lduarte1991 848c7165e3 Annotation Tool: PR #4019 ...

Reverting commit @3bfb633 and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py

2014-06-11 10:21:08 -04:00

..

djangoapps

Fix location.url [LMS-2786]

2014-06-09 15:17:20 -04:00

lib

Annotation Tool: PR #4019

2014-06-11 10:21:08 -04:00

static

Annotation Tool: PR #4019

2014-06-11 10:21:08 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…