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

..

features

Merge pull request #2343 from edx/dstgermain/a11y-page-titles

2014-01-30 14:33:48 -08:00

management

Use XBlock xml serialization and deserialization

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

migrations

Fix 0010 courseware migration

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

mock_lti_server

Add role parameter to LTI. BLD-583.

2014-01-30 14:37:33 +02:00

tests

Merge remote-tracking branch 'origin/release'

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

__init__.py

Moving LMS code into subdirectory

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

access.py

Unicode changes to support QRF

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

admin.py

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

courses.py

Correctly compute course image location when using mongo modulestore

2014-01-22 07:17:40 -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

Rename DbModel to KvsFieldData.

2014-01-14 13:09:36 -05:00

models.py

Fix (re-implement) answer distribution report generation.

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

module_render.py

Unicode changes to support QRF

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

progress.py

Cleaning up pep8 violations

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

tabs.py

settings.MITX_FEATURES => settings.FEATURES

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

urls.py

Moving LMS code into subdirectory

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

views.py

Midcourse reverifications: dismissal banner

2014-01-31 22:20:32 +00:00