Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -04:00

..

calc

Upgrade pyparsing to 2.0.1

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

capa

Merge pull request #3946 from edx/anton/i18n-code-response

2014-06-02 16:32:45 +03:00

chem

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -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 branch 'release'

2014-06-02 15:29:40 -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

Sort the css and js assets by numerical index

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

supertrace.py

…

tempdir.py

…