Feanil Patel 5e5c59cab2 Merge remote-tracking branch 'origin/release' ...

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

Took the changes that were on the release branch.

2014-02-03 16:39:40 -05:00

..

mongo

Detached categories don't access control on date

2014-01-17 17:53:14 -05:00

split_mongo

add logging for auditing when split-mongo courses are deleted

2014-01-29 16:57:23 -05:00

tests

fix pep8/pylint issues

2014-01-29 15:11:04 -05:00

__init__.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

django.py

fix test failures: clear loc_mapper cache

2014-01-29 15:11:03 -05:00

draft.py

Make DraftModuleStore mongo only

2013-07-01 12:33:08 -04:00

exceptions.py

Don't mix versions in same object:

2013-10-22 10:25:15 -04:00

inheritance.py

annotation tools

2014-01-27 13:47:58 -05:00

loc_mapper_store.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

locator.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

mixed.py

Proper abstraction of Module store base class implemented

2013-10-30 16:35:56 -04:00

parsers.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

search.py

initial commit for a mixed module store which can interoperate with both XML and Mongo module stores

2013-08-15 22:56:32 -04:00

split_migrator.py

make SplitMigrator take a User object, rather than a user ID

2014-01-29 15:11:02 -05:00

store_utilities.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

xml_exporter.py

Convert between export formats.

2014-01-30 09:22:43 -05:00

xml_importer.py

Prevent unicode data from being injected into a Location using the _replace function

2014-01-14 13:28:49 -05:00

xml.py

Detached pages from XML courses are set to appropriate descriptor class (LMS-2094)

2014-01-30 13:52:07 -05:00