Chris Dodge fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py

2013-05-20 10:22:36 -04:00

..

__init__.py

Cleaning up pep8 violations

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

test_checklists.py

Re-enable all the tests!

2013-03-22 14:00:20 -04:00

test_contentstore.py

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -04:00

test_core_caching.py

more cleanups in CMS project

2013-04-13 21:13:34 -04:00

test_course_settings.py

Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore).

2013-05-16 17:15:53 -04:00

test_course_updates.py

fix some violations. Build up karma

2013-05-13 11:10:11 -04:00

test_i18n.py

fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test

2013-05-15 11:16:47 -04:00

test_item.py

Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore).

2013-05-16 17:15:53 -04:00

test_utils.py

fix brokn tab test

2013-05-13 14:57:36 -04:00

tests.py

Fix gradebook when using grade cutoffs other than A/B/C

2013-04-16 11:38:58 -04:00

utils.py

Fix pylint and pep8 errors

2013-04-16 11:45:21 -04:00