Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

_about_pages.scss

revised minor syntax/line indents on faq scss and js

2013-01-15 15:30:53 -05:00

_course_about.scss

Some edits for the resources box

2012-09-07 09:49:43 -04:00

_courses.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_dashboard.scss

pearson registration - adjusted style for rejected message state on dashboard

2013-01-10 17:08:01 -05:00

_edge.scss

styled edge registration form

2012-10-12 11:18:55 -04:00

_error-pages.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_help.scss

Added bottom margin for articles in help

2012-07-23 19:19:50 -04:00

_home.scss

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

_jobs.scss

Update Job Page with new positions

2012-10-24 20:30:54 -04:00

_media-kit.scss

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

_password_reset.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_press_release.scss

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

_testcenter-register.scss

pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately

2013-01-15 14:52:39 -05:00