Chris Dodge d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py

2013-04-10 12:02:16 -04:00

..

contentstore

Don't collapse multiple underscores for asset names.

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

css

Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes

2013-04-02 18:36:19 -07:00

js

Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes

2013-04-02 18:36:19 -07:00

modulestore

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-10 12:02:16 -04:00

open_ended_grading_classes

Merge branch 'master' into bug/christina/studio

2013-04-01 12:30:07 -04:00

templates

Fix issues with progress page and open ended grading

2013-03-27 18:20:04 -04:00

tests

seems like we need to purge 'filename' from both _model_data as well as xml_attributes

2013-04-08 16:09:41 -04:00

util

Change display_timezone to show_timezone.

2013-04-08 09:11:10 -04:00

__init__.py

…

abtest_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

annotatable_module.py

merged from master and resolved conflict with annotatable module.

2013-03-18 15:51:27 -04:00

backcompat_module.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

capa_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

combined_open_ended_module.py

Fix pg progress

2013-04-05 11:58:16 -04:00

conditional_module.py

add default message to conditional

2013-03-31 12:31:05 +00:00

course_module.py

Change display_timezone to show_timezone.

2013-04-08 09:11:10 -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

Added exception handling that solves SchematicResponse exceptions

2013-03-27 14:33:59 -04:00

fields.py

Delete converters, move unit tests to test_fields, add new additional test cases.

2013-03-27 12:56:06 -04:00

foldit_module.py

Remove string default value.

2013-04-02 15:21:09 -04:00

graders.py

modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections

2013-03-29 01:27:36 -04: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

wip

2013-04-02 14:19:54 -04:00

mako_module.py

remove unsed import

2013-04-08 09:09:51 -04:00

peer_grading_module.py

Fix weighting and score generation

2013-04-08 16:52:18 -04:00

plugin.py

…

poll_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

progress.py

…

randomize_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -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

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

seq_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -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

Convert due date to a Date (vs. a string with no year).

2013-04-01 11:37:05 -04:00

timelimit_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

timeparse.py

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

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

vertical_module.py

Update to version of xblock that supports full inheritance of field attributes

2013-03-13 14:51:10 -04:00

video_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

videoalpha_module.py

Migrate to the open source XBlock repo

2013-04-04 10:55:31 -04:00

wrapper_module.py

poll and conditional finished

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

x_module.py

list xml_attributes (new field since xblock integration) as system metadata which should not be edited in Studio

2013-04-01 11:11:30 -04:00

xml_module.py

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-08 15:02:47 -04:00