marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

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

..

accordion.html

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

2013-09-12 14:30:00 -04:00

course_about.html

make ENABLE_SHOPPING_CART truly optional

2013-09-30 09:09:17 -07:00

course_navigation.html

Integrate split testing and LMS tabs experiments

2013-09-25 00:27:36 -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

Visual rearrangement of new dash "Student Admin" page

2013-09-27 12:17:24 -04:00

mktg_coming_soon.html

edx.org: addresses vertical scrollbar on course register button when placed in iframe

2013-09-05 08:49:02 -04:00

mktg_course_about.html

edx.org: addresses vertical scrollbar on course register button when placed in iframe

2013-09-05 08:49:02 -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

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

2013-09-12 14:30:00 -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

Refactor tab tests

2013-09-25 00:27:36 -04:00

xqa_interface.html

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

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