Victor Shnayder 84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

2013-03-08 00:40:18 -05:00

..

annotatable

Added instructions/documentation to the studio template for content authors.

2013-03-06 14:33:04 -05:00

capa

Merge branch 'master' into fix/will/mc_checkbox_bug

2013-03-07 12:07:34 -05:00

codemirror

added code mirror styles

2012-10-03 09:47:19 -04:00

combinedopenended

Swap b tag for span

2013-02-13 11:29:18 -05:00

editor

Some refactoring from Brian's submission.

2013-01-17 10:36:04 -05:00

foldit

Included styling and template

2013-02-25 18:18:46 -05:00

html

xmodule scss - resolved some general span styling that would override basic em or strong type styling

2013-02-19 09:59:36 -05:00

poll

UI changes.

2013-02-25 12:33:49 +02:00

problem

studio - further resolved bug with .header CSS inheritance and problem editor menu UI

2013-01-23 12:58:20 -05:00

sequence

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

video

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

videoalpha

Renamed videox to videoalpha, as per Piotr naming scheme request.

2013-02-13 10:27:55 +02:00

wrapper

poll and conditional finished

2013-02-15 18:48:39 +02:00