Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

mongo

Renamed course_key to structure_key to reflect the fact it might be a library key as well.

2015-04-14 14:43:37 +03:00

perf_tests

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

split_mongo

Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page

2015-05-08 15:06:03 +05:00

tests

Merge remote-tracking branch 'origin/release' into merge-release-to-master

2015-05-08 10:23:04 -04:00

__init__.py

Change str to repr and change formatting.

2015-05-04 14:54:11 -04:00

django.py

Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes

2015-04-14 12:40:05 +03:00

draft_and_published.py

Clean up exception definitions

2014-09-29 22:35:41 -04:00

draft.py

Remove unused imports

2015-03-17 07:10:31 -04:00

edit_info.py

Move edit info into xblock and runtime mixins

2014-09-02 10:08:39 -04:00

exceptions.py

Fix Pylint: E1305(too-many-format-args)

2015-03-13 20:20:04 -07:00

inheritance.py

Architecture for arbitrary field overrides, field overrides for

2015-04-06 13:04:44 -07:00

mixed.py

Finishing async course structure work

2015-02-13 12:21:51 -05:00

modulestore_settings.py

make block.get_parent() work.

2015-01-15 10:33:44 -05:00

mongoengine_fields.py

Fixed some isinstance errors with opaque-keys

2014-07-11 15:40:08 -04:00

search.py

Addresses problem with 'up' and 'down' errors within SOL-289

2015-03-17 15:12:38 -04:00

split_migrator.py

Add a fix_not_found command to get rid

2015-01-12 10:42:52 -05:00

store_utilities.py

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

xml_exporter.py

Add has_changes check for draft modules before exporting them.

2015-05-04 14:54:12 -04:00

xml_importer.py

Merge branch 'release'

2015-05-05 16:27:45 -04:00

xml.py

prevent overly nesting _field_data (TNL-2050)

2015-05-07 14:05:27 -04:00