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

..

cache_toolbox

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

contentserver

remove debugging logging

2013-08-15 22:58:02 -04:00

course_groups

Pep8/pylint fixes

2013-08-21 19:42:59 -04:00

course_modes

If user has previously selected a price, show it on the choose page

2013-09-10 14:35:57 -04:00

datadog

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

django_comment_common

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

django_future

Cleaning up pep8 violations

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

external_auth

remove spaces from usename suggestion

2013-09-10 10:42:19 -07:00

heartbeat

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

mitxmako

Add mitxmako.middleware to fix workers

2013-09-09 11:13:50 -04:00

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_mako

Move underscore templates into separate files, included in Mako templates

2013-05-22 15:55:50 -04:00

request_cache

use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down

2013-03-27 22:37:07 -04:00

service_status

Add status app with simple view to check celery workers

2013-05-17 11:33:14 -04:00

static_replace

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

status

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

student

Merge pull request #905 from rocha/datadog-statsd

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

terrain

Update requests library to 1.2.3

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

track

Merge pull request #938 from rocha/mock-mongo-on-event-tracking-tests

2013-09-12 11:27:22 -07:00

util

add simple unit test on the defaulting of the settings

2013-07-11 14:31:53 -04:00

tests.py

Use XBlock 0.3

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

xmodule_modifiers.py

Use XBlock 0.3

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