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

..

emails

changed studio to edge in emails

2012-10-11 16:25:39 -04:00

registration

fix bug where activation page was blank

2012-10-15 13:52:41 -04:00

widgets

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

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

activation_active.html

Change url for login from login to signin.

2013-02-15 17:30:24 -05:00

activation_complete.html

Change url for login from login to signin.

2013-02-15 17:30:24 -05:00

activation_invalid.html

remove empty marketing template

2012-07-16 13:34:05 -04:00

asset_index.html

studio - page headers: added in logic to style page actions' height based on title having a subtitle or not

2013-02-14 09:38:32 -05:00

base.html

Added empty metadata attribute instead of using name to determine which

2013-02-13 16:33:19 -05:00

component.html

studio HTML editor - codemirror/tinymce toggle work - wip

2013-01-16 14:54:28 -05:00

course_index.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

course_info.html

made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750

2013-02-19 17:18:09 -05:00

edit_subsection.html

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

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

edit-static-page.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

edit-tabs.html

made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750

2013-02-19 17:18:09 -05:00

editable_preview.html

Added tool tip text to several other UI controls in templates

2012-12-10 13:32:06 -05:00

error.html

template for 404 and 500 errors

2012-10-11 09:58:35 -04:00

export.html

studio - page headers: added in logic to style page actions' height based on title having a subtitle or not

2013-02-14 09:38:32 -05:00

howitworks.html

studio - adding in info icon to page intro help and making icon classes consistent in all new references

2013-02-19 12:13:08 -05:00

import.html

Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.

2013-03-01 14:55:38 -05:00

index.html

made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750

2013-02-19 17:18:09 -05:00

login.html

studio - soft landing: changing 'sign into' to 'sign in to' copy

2013-02-13 12:18:27 -05:00

manage_users.html

made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750

2013-02-19 17:18:09 -05:00

new_item.html

WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms

2012-12-28 14:44:31 -05:00

overview.html

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

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

settings_advanced.html

added question marks

2013-02-21 22:47:48 -05:00

settings_discussions_faculty.html

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

settings_graders.html

added question marks

2013-02-21 22:47:48 -05:00

settings.html

added question marks

2013-02-21 22:47:48 -05:00

signup.html

studio - link wiring and spot styling changes for new nav/soft landing/settings work

2013-02-12 11:16:37 -05:00

static-pages.html

added templates/styles for static pages

2012-10-09 14:47:15 -04:00

temp-course-landing.html

added edge logo; added edge temp landing page

2012-10-11 12:29:14 -04:00

unit.html

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

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

xmodule_tab_display.html

made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button

2012-11-26 14:22:13 -05:00