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

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-13 12:18:04 -04:00

..

contentstore

Don't collapse multiple underscores for asset names.

2013-03-05 10:55:27 -05:00

css

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

2013-03-08 00:40:18 -05:00

js

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

2013-03-08 00:40:18 -05:00

modulestore

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

open_ended_grading_classes

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

2013-03-13 12:18:04 -04:00

templates

fixed typo

2013-03-06 14:40:35 -05:00

tests

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

2013-03-13 12:18:04 -04:00

util

Pep8 autofixes

2013-02-06 11:13:50 -05:00

__init__.py

…

abtest_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

annotatable_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

backcompat_module.py

…

capa_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

combined_open_ended_module.py

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

2013-03-13 12:18:04 -04:00

conditional_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

course_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

discussion_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

editing_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

error_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

errortracker.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

exceptions.py

…

fields.py

Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api

2013-01-04 16:19:58 -05:00

foldit_module.py

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

2013-03-13 12:18:04 -04:00

graders.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

gst_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

hidden_module.py

Make hidden_module not cause 500 errors by adding a get_html()

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

html_checker.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

html_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

mako_module.py

Fix tests except for conditional module and open ended grading

2013-03-05 15:04:59 -05:00

peer_grading_module.py

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

2013-03-13 12:18:04 -04:00

plugin.py

…

poll_module.py

Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data

2013-03-13 11:56:53 -04:00

progress.py

…

randomize_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

raw_module.py

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

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

schematic_module.py

…

seq_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

static_content.py

…

stringify.py

poll and conditional finished

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

template_module.py

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

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

templates.py

clean up templates that were removed from disk - we need to remove from DB as well

2013-02-12 10:23:32 -05:00

timeinfo.py

Improve documentation

2013-02-06 15:00:08 -05:00

timelimit_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

timeparse.py

Merge branch 'master' into feature/diana/close-oe-problems

2013-02-06 13:26:22 -05:00

vertical_module.py

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

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

video_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

videoalpha_module.py

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

2013-03-13 11:35:50 -04:00

wrapper_module.py

poll and conditional finished

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

x_module.py

Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data

2013-03-13 11:56:53 -04:00

xml_module.py

Do metadata name translation in json import as well as xml import

2013-03-13 07:42:14 -04:00