David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

accordion.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

course_about.html

Remove mock verify enrollment link

2013-08-26 16:02:56 -04:00

course_navigation.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

courses.html

replace edx with variable substitution

2013-07-31 19:39:15 -04:00

courseware-error.html

replace edx with variable substitution

2013-07-31 19:39:15 -04:00

courseware.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

grade_summary.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

gradebook.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

info.html

wrong accessor

2013-08-02 21:45:51 -04:00

instructor_dashboard.html

Change bulk email model field names and add migrations

2013-08-29 12:40:33 -04:00

mktg_coming_soon.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

mktg_course_about.html

Connect new button to mode selection

2013-08-22 17:50:50 -04:00

news.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

notifications.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

progress_graph.js

Added parameters to hide grade totals and grade cutoffs in progress graph.

2012-12-19 12:37:02 -05:00

progress.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

static_tab.html

add escaping

2013-08-02 09:51:41 -04:00

submission_history.html

Prevent XSS attack via submission_history page.

2013-07-23 17:23:59 -04:00

syllabus.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

welcome-back.html

make template string unicode

2013-08-09 12:25:14 -04:00

xqa_interface.html

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

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