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

..

calc

bump version number on calc

2013-08-30 16:59:46 -04:00

capa

Merge pull request #905 from rocha/datadog-statsd

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

chem

Remove unused imports from common, as reported by pylint.

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

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

Pylint complains if you use string, even if you use it for what its still meant to be used for.

2013-06-21 16:35:47 -04:00

xmodule

Merge branch 'release'

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

django_startup.py

Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi

2013-08-28 10:56:07 -04:00

html_to_text.py

Hide "Email Settings" from student dash if bulk email not enabled

2013-08-29 12:40:33 -04:00

logsettings.py

Change console logging stream from stdout to stderr

2013-08-08 17:39:23 -04:00

rooted_paths.py

Sort the css and js assets by numerical index

2013-04-29 07:31:48 -04:00

sample-post.py

Update requests library to 1.2.3

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

supertrace.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

tempdir.py

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -05:00