Chris Dodge 625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export ...

Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py

2012-12-27 14:16:40 -05:00

..

tests

Add more tests and replace ':' with '_' in html_id

2012-09-13 09:44:51 -04:00

__init__.py

Show error if organization name has invalid characters

2012-12-10 15:19:34 -05:00

django.py

commenting out the pre-loading of modules until we get a better way in place (that doesn't hang on deploy)

2012-08-27 18:46:13 -04:00

draft.py

per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type

2012-10-12 11:00:34 -04:00

exceptions.py

Return a custom error for duplicate elements, and ignore it when loading into mongo

2012-07-30 13:16:21 -04:00

mongo.py

fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store

2012-12-17 10:41:54 -05:00

search.py

Fixing tests from changes around draft mode

2012-10-10 12:49:51 -04:00

store_utilities.py

fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course

2012-12-27 10:20:28 -05:00

xml_exporter.py

initial checkin of export

2012-12-13 11:53:52 -05:00

xml_importer.py

initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from

2012-12-12 10:57:06 -05:00

xml.py

fix crash with working with custom tags with XML filestore

2012-11-29 13:24:07 -05:00