Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

features

BLD-642: Allow multiple transcripts with video.

2014-02-24 21:57:08 +02:00

management

Remove unused imports.

2014-02-10 14:07:50 -05:00

migrations

Fix 0010 courseware migration

2013-11-20 20:39:40 -08:00

tests

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

grades.py

Fixed all instances of "occured" typo

2014-01-24 16:13:26 -08:00

masquerade.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

model_data.py

Move FieldDataCache assert to check both get and get_or_create

2014-02-27 20:06:16 -08:00

models.py

Fix (re-implement) answer distribution report generation.

2013-12-20 15:05:50 -05:00

module_render.py

Merge pull request #2603 from cpennington/xblock-acid-resources-test

2014-02-25 16:46:10 -05:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

tabs.py

add i18n scraping to tabs.py (LMS-2166)

2014-02-24 15:46:03 -05:00

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00