merge release back into master - #3500

Merged

singingwolfboy merged 10 commits into

Apr 28, 2014

Commits on Apr 22, 2014

Make TinyMCE more tolerant about HTML elements
andy-armstrong
committed
b5e9961

Commits on Apr 23, 2014

fixes templating error (LMS-2560)
adampalay
committed
d61abab
Remove verify_html as it isn't supported in TinyMCE 4
andy-armstrong
committed
4cfa280
Merge pull request #3442 from edx/adam/fix-template-error
adampalay
committed
0e72c8c
Merge pull request #3437 from edx/andya/rc-fix-tinymce
andy-armstrong
committed
56bf7d8
Add support for raw HTML editor.
cahrens
committed
ae886f1
adjust codemirror window on raw HTML editor

Frances Botsford
authored and
cahrens
committed
6e8ccc5
UI String Updates for Raw HTML Editor Change

mhoeber
authored and
cahrens
committed
fe50a35
Tests for raw editor and minor wording changes.
cahrens
committed
f61421d

Commits on Apr 24, 2014

Merge pull request #3449 from edx/hotfix/2014-04-24
singingwolfboy
committed
6416949