Diana Huang 90951a7bdb Merge branch 'release' ...

Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py

2013-09-12 16:03:39 -04:00

..

features

Remove unimplemented steps from certificates acceptance test code

2013-09-12 14:54:01 -04:00

management

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

migrations

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

mock_lti_server

Use oauthlib directly for LTI module

2013-09-10 11:02:30 -04:00

mock_xqueue_server

small pep8 pylint and superclass fixes

2013-03-29 10:41:27 -04:00

mock_youtube_server

Update requests library to 1.2.3

2013-09-10 09:59:21 -04:00

tests

pylint/pep8

2013-09-12 14:30:00 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

admin.py

Limit the rate of logins.

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

courses.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

grades.py

check if module created from description is None before looking for its child descriptors

2013-09-11 18:33:51 -04:00

masquerade.py

use ENABLE_MASQUERADE in masquerade.py

2013-04-13 22:52:17 -04:00

model_data.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

models.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

module_render.py

Merge pull request #905 from rocha/datadog-statsd

2013-09-12 06:53:02 -07:00

progress.py

Cleaning up pep8 violations

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

tabs.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

2013-09-12 14:30:00 -04:00