annotation tools#2515

Closed

danielcebrian wants to merge 18 commits intoopenedx:masterfrom

danielcebrian:master

Commits on Apr 11, 2014

first commit to the branch

danielcebrian
authored and
lduarte1991
committed
Added padding to the top of the title (only when it's in the annotatable-wrapper)
lduarte1991
committed
Added logic to make sure that when adding a new component, only 1 annotation component is allowed per unit.
lduarte1991
committed
Revert "Added logic to make sure that when adding a new component, only 1 annotation component is allowed per unit."
lduarte1991
committed
Changed the location of the javascript files so they were attached to the module and not loaded everywhere else
lduarte1991
committed
Fixed location of the annotation tool code from vendor to xmodule/js, fixed TinyMCE issue and image issues
lduarte1991
committed
For some reason it didn't save my movement of the files the first time
lduarte1991
committed
Accidentally capitalized one letter in a file_name call
lduarte1991
committed
Still some files that git refused to add
lduarte1991
committed
Collapsable code was referenced as coffee instead of javascript
lduarte1991
committed
Moved vjs.youtube.js into the xmodule so it wouldn't throw an error in the console.
lduarte1991
committed
Added missing youtube javascript file
lduarte1991
committed
Removed our version of the firebase-token-generator for the one in PyPl
lduarte1991
committed
added new tinymce plugins needed for annotation tool
lduarte1991
committed
For final jenkins test fixes
lduarte1991
committed

Commits on Apr 21, 2014