Calen Pennington 155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py

2014-05-09 15:29:32 -04:00

..

calc

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

capa

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

chem

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

opaque_keys

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 07:40:25 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

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

symmath

pep8/pylint cleanup on symmath/formula.py

2014-02-11 09:46:24 -05:00

xmodule

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

django_startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

extract_tar.py

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -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

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00

mail_utils.py

Wraps long lines in bulk email messages.

2014-04-25 18:25:20 +05:00

rooted_paths.py

…

sample-post.py

Update requests library to 1.2.3

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

supertrace.py

…

tempdir.py

…