Calen Pennington 4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model ...

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	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.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile

2013-02-07 15:12:30 -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/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00

activation_active.html

remove empty marketing template

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

activation_complete.html

remove empty marketing template

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

activation_invalid.html

remove empty marketing template

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

asset_index.html

Fix bug related to img link for non-img files.

2013-01-16 13:51:17 -05:00

base.html

Merge pull request #1160 from MITx/feature/btalbot/cms-gradable

2012-12-14 14:09:28 -08:00

component.html

studio HTML editor - codemirror/tinymce toggle work - wip

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

course_index.html

First stab at an import page. Needs styling

2012-10-12 11:58:43 -04:00

course_info.html

Ensure settings and course info CRUD operations tell the user if there's

2013-01-30 11:24:55 -05:00

edit_subsection.html

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

2013-02-07 15:12:30 -05:00

edit-static-page.html

studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)

2013-01-22 15:51:12 -05:00

edit-tabs.html

pages - made intro text visible again and styled it some

2012-12-14 16:15:01 -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

in progress

2013-01-17 09:10:23 -05:00

import.html

clean up of users page

2012-12-13 11:28:59 -05:00

index.html

tweaked body color and window styles; adjusting new buttons

2012-12-13 11:20:30 -05:00

login.html

Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment

2012-10-25 10:47:41 -04:00

manage_users.html

clean up of users page

2012-12-13 11:28:59 -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/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00

settings.html

Ensure settings and course info CRUD operations tell the user if there's

2013-01-30 11:24:55 -05:00

signup.html

more prominent log in link on sign up form

2012-10-17 12:51:48 -04: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/cale/xmodule-storage-model

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