Chris Dodge 08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py

2013-01-11 14:04:46 -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

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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

fixed ie banner showing outside of courseware bug

2012-10-04 15:50:02 -04: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

Bring back bullets in lists

2012-09-13 16:46:19 -04:00

_profile.scss

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

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

_staff_grading.scss

Updates to the CSS

2013-01-09 10:19:42 -05:00

_syllabus.scss

cs188 styling

2012-09-22 22:54:41 -07:00

_tabs.scss

fixed custom tab box-sizing glitch in firefox

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

_textbook.scss

fix merge conflicts

2012-08-20 18:07:32 -04:00