Arthur Barrett afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule

2013-02-27 11:58:38 -05:00

..

course_groups

Only show cohort config for cohorted courses

2013-01-24 15:14:34 -05:00

courseware

Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.

2013-02-27 11:42:06 -05:00

discussion

make cohort filter visibility conditional on selected commentable cohortedness

2013-02-08 17:22:29 -05:00

emails

…

instructor

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-19 15:21:09 -05:00

licenses

…

open_ended_problems

Add in support for getting and displaying ETA

2013-02-20 13:28:37 -05:00

peer_grading

Fix location strings, re-order checkboxes

2013-02-20 18:04:25 -05:00

registration

…

simplewiki

…

static_templates

add press release: edX expands internationally

2013-02-20 17:50:23 -05:00

university_profile

Change TorontoX to University of TorontoX

2013-02-27 10:05:58 -05:00

wiki

…

.gitignore

…

.hgignore

…

accounts_login.html

…

annotatable.html

bolded the section titles and added unittest skeleton for module

2013-02-26 12:15:43 -05:00

book_toc.xml

…

combined_open_ended_legend.html

Fix colors on legend, add random assessment

2013-02-08 23:59:39 -05:00

combined_open_ended_results.html

Centralized rubric now displays properly

2013-02-07 18:21:50 -05:00

combined_open_ended_status.html

Remove score display from status bar

2013-02-13 16:05:12 -05:00

combined_open_ended.html

Log rubric selection clicks

2013-02-13 16:48:58 -05:00

conditional_ajax.html

add coffeescript/js for conditional module, does XModule.loadModules

2013-02-03 18:53:51 -05:00

conditional_module.html

for require_attempted display "attempted" instead of "completed"

2013-02-04 19:54:36 -05:00

contact.html

…

course_filter.html

…

course.html

…

dashboard.html

Minor update to embargo text

2013-01-29 16:47:09 -05:00

edit_circuit.html

…

email_change_successful.html

…

email_exists.html

…

emails_change_successful.html

…

enroll_students.html

…

extauth_failure.html

…

feed.rss

add press release: edX expands internationally

2013-02-20 17:50:23 -05:00

feedback_email.txt

…

foldit.html

Foldit integration.

2013-02-14 12:45:06 -05:00

footer.html

Added one more year!

2013-01-25 13:31:23 -05:00

forgot_password_modal.html

…

google_analytics.html

…

graphical_slider_tool.html

Removed unnecessary XML section. Documenting.

2013-01-15 12:55:13 +02:00

homework.html

…

identity.xml

…

index.html

Change TorontoX to University of TorontoX

2013-02-27 10:05:58 -05:00

invalid_email_key.html

…

login_modal.html

…

main_django.html

…

main.html

Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.

2013-02-06 15:23:11 -05:00

module-error.html

…

name_changes.html

…

navigation.html

…

open_ended_combined_rubric.html

Swap b tag for span

2013-02-13 11:29:18 -05:00

open_ended_error.html

…

open_ended_evaluation.html

…

open_ended_feedback.html

Start to abstract away rendering of feedback from the open ended module into the combined module

2013-02-09 00:44:50 -05:00

open_ended_result_table.html

Add missing tag

2013-02-09 11:14:12 -05:00

open_ended_rubric.html

Address code review feedback

2013-02-21 10:17:08 -05:00

open_ended_view_only_rubric.html

Fix respond to feedback

2013-02-09 08:46:24 -05:00

open_ended.html

Render to string fix, display ETA message when student submits

2013-02-20 16:30:44 -05:00

press.json

…

problem_ajax.html

Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating).

2013-01-29 16:30:41 -05:00

problem.html

…

provider_login.html

…

self_assessment_hint.html

Trim hint and submit messages out of self assessment

2013-02-09 09:06:14 -05:00

self_assessment_prompt.html

Trim hint and submit messages out of self assessment

2013-02-09 09:06:14 -05:00

self_assessment_rubric.html

Make the rubric for self-assessment selectable and remove the

2013-02-01 15:15:42 -05:00

seq_module.html

…

show_circuit.html

…

signup_modal.html

Fix placeholder email in signup form

2013-02-05 22:24:20 -05:00

staff_problem_info.html

limit staff debug verbosity to locations of specific categories

2013-02-08 10:52:03 -05:00

static_pdfbook.html

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

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

staticbook.html

…

stripped-main.html

…

tab_module.html

…

test_center_register.html

add UTC time to registration end date

2013-01-24 01:18:10 -05:00

tracking_log.html

…

using.html

…

vert_module.html

…

video_modal.html

…

video.html

Hack to disable YouTube <iframe> API when they break it.

2013-02-06 22:37:41 -05:00

videoalpha.html

YouTube HTML5 mode is used by default. Fix typo in video alpha template.

2013-02-14 11:22:14 +02:00

xrds.xml

…