Calen Pennington 1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py

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

..

course_groups

Only show cohort config for cohorted courses

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

courseware

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

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

discussion

new cohorts tested

2013-03-01 16:33:27 -05:00

emails

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

instructor

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

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

licenses

Added html view of serial numbers. Refactored code.

2012-10-15 18:46:31 -04:00

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

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

simplewiki

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-20 16:10:17 -04:00

static_templates

add a question about account changes to the help page

2013-02-28 20:44:18 -05:00

university_profile

Change TorontoX to University of TorontoX

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

wiki

Added call to load schematics on wiki pages.

2012-09-13 12:38:28 -04:00

.gitignore

…

.hgignore

…

accounts_login.html

perform a new merge from master, resolve conflicts

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

admin_dashboard.html

Cleaned up admin_dashboard code and template

2013-02-28 11:11:57 -05:00

book_toc.xml

XML based table of contents for books.

2012-08-08 14:13:20 -04:00

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

poll and conditional finished

2013-02-15 18:48:39 +02:00

conditional_module.html

poll and conditional finished

2013-02-15 18:48:39 +02:00

contact.html

…

course_filter.html

…

course.html

Fix tests post-merge

2013-02-13 14:13:22 -05:00

dashboard.html

Minor update to embargo text

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

edit_circuit.html

…

email_change_successful.html

Change email change success notice to say email instead of name

2012-10-18 12:20:52 -04:00

email_exists.html

…

emails_change_successful.html

…

enroll_students.html

Added missing file

2012-08-22 16:15:24 -04:00

extauth_failure.html

add openid authentication

2012-08-01 14:59:55 -04:00

feed.rss

add press release: edX expands internationally

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

feedback_email.txt

…

foldit.html

Allow progress without leaderboard and vice-versa

2013-02-25 17:28:22 -05:00

folditbasic.html

Included styling and template

2013-02-25 18:18:46 -05:00

folditchallenge.html

Included styling and template

2013-02-25 18:18:46 -05:00

footer.html

Added one more year!

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

forgot_password_modal.html

…

google_analytics.html

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

graphical_slider_tool.html

Removed unnecessary XML section. Documenting.

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

homework.html

…

identity.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00

index.html

Change TorontoX to University of TorontoX

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

invalid_email_key.html

…

login_modal.html

optimize!

2012-09-24 09:22:35 -04:00

main_django.html

Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html.

2012-09-13 11:39:32 -04:00

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

more template updates to rename MITx to edX

2012-09-06 15:12:19 -04:00

name_changes.html

First pass at branding the header logo on subdomains

2012-08-22 14:05:19 -04:00

navigation.html

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

open_ended_combined_rubric.html

Swap b tag for span

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

open_ended_error.html

perform a new merge from master, resolve conflicts

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

open_ended_evaluation.html

Remove html

2013-01-10 19:00:02 -05:00

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

poll.html

poll and conditional finished

2013-02-15 18:48:39 +02:00

press.json

add press mentions for October, update missing logos, and add sorting.

2012-11-19 10:28:40 -05:00

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

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

provider_login.html

[#35491529] Small corrections to OpenID provider login page

2012-09-04 20:53:51 -04:00

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

Make editing work, building towards drag/drop saving

2012-10-01 15:17:41 -04:00

show_circuit.html

…

signup_modal.html

Fix placeholder email in signup form

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

staff_problem_info.html

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

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

static_pdfbook.html

fix viewing of pdfbook on firefox

2013-02-27 17:09:50 -05:00

staticbook.html

Display the last top level element in the Table of Contents as expandable.

2012-09-19 17:37:15 -04:00

stripped-main.html

transferred edge styles from cms to lms

2012-10-11 14:02:13 -04:00

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

fix view_tracking_log to show proper timezone

2012-08-17 15:46:09 -04:00

using.html

…

vert_module.html

Make drag/drop save content immediately in seqs and verticals

2012-10-01 15:17:41 -04:00

video_modal.html

…

video.html

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -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

OpenID provider implementation

2012-08-29 10:29:42 -04:00