Calen Pennington 1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-04 16:33:40 -05:00

..

base

revised no certificate state for dashboard messages and removed course message UI for future work on separate branch

2012-11-09 18:18:36 -05:00

courseware

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

discussion

Remove unused askbot/discussion sass stylesheets

2012-11-27 19:06:03 -05:00

instructor

new header styles

2012-08-21 14:46:35 -04:00

layout

lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav

2013-02-07 12:35:52 -05:00

wiki

Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"

2012-09-07 14:18:34 -04:00

_discussions-inline.scss

tweaked inline responses and new response toolbar

2012-09-11 10:59:40 -04:00

_gradebook.scss

started new gradebook functionality

2012-08-23 16:40:48 -04:00

_info.scss

temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)

2013-02-01 09:41:51 -05:00

_open_ended_grading.scss

Use the variable and not the hex value.

2013-01-29 21:24:04 -05:00

_profile.scss

Increase height of progress graph; allows for more cutoffs to look reasonable

2012-09-23 20:53:38 -07:00

_rubric.scss

Remove ability to manually get results

2013-02-07 18:02:48 -05:00

_staff_grading.scss

Increase padding a bit

2013-02-11 11:33:44 -05:00

_syllabus.scss

lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling

2013-01-31 18:15:20 -05:00

_tabs.scss

fixed custom tab box-sizing glitch in firefox

2012-10-01 10:09:56 -04:00

_textbook.scss

use same images for prev/next as used in image-based textbooks

2013-02-26 16:43:48 -05:00