Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

2014-05-13 11:10:48 -04:00

..

announcement.yaml

minor change to html in announcement unit (STUD-1334)

2014-02-24 10:34:44 -05:00

anon_user_id.yaml

Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.

2013-11-18 14:44:46 -08:00

iframe.yaml

Added template for iFrames. [BLD-611]

2014-03-26 05:03:43 +01:00

image_modal.yaml

Updated title and template for image modal html component

2014-02-10 09:18:00 -05:00

latex_html.yaml

Fix missing source_code in LaTeX HTML.

2013-08-01 17:27:34 -04:00

raw.yaml

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

zooming_image.yaml

Fixes LMS-1740 by activating the zooming diagram with the spacebar.

2014-04-01 10:12:21 -04:00