Adam Palay 4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 ...

Conflicts:
	requirements/edx/github.txt

2015-06-29 16:55:57 -04:00

..

__init__.py

Cleaning up pep8 violations

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

test_clone_course.py

Configuration error on course re-run

2015-05-11 16:19:21 +05:00

test_contentstore.py

Merge pull request #8224 from Stanford-Online/kluo/course-creation-after-deletion

2015-06-16 11:24:50 -04:00

test_core_caching.py

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

test_course_create_rerun.py

More PEP8/pylint cleanup

2014-08-21 12:11:29 -04:00

test_course_listing.py

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

test_course_settings.py

Make course tab refreshing safer.

2015-06-19 14:53:49 -04:00

test_courseware_index.py

Merge pull request #8229 from edx/dcikatic/SOL-536

2015-06-03 13:55:42 +02:00

test_crud.py

Always call super(..).setUp() from setUp

2015-02-04 09:09:14 -05:00

test_export_git.py

Added git clean to git export feature

2014-09-05 16:29:48 -04:00

test_i18n.py

Always call super(..).setUp() from setUp

2015-02-04 09:09:14 -05:00

test_import_draft_order.py

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

test_import_pure_xblock.py

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

test_import.py

edx-val-Fix VAL error on re-import

2015-05-11 20:00:55 +05:00

test_libraries.py

Remove restrictions on library creation in Studio

2015-06-25 12:57:56 -07:00

test_orphan.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_permissions.py

Update for split modulestore as default.

2015-02-09 10:00:14 -05:00

test_request_event.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

test_transcripts_utils.py

add name param check_transcripts

2015-06-12 16:34:45 +05:00

test_users_default_role.py

Update for split modulestore as default.

2015-02-09 10:00:14 -05:00

test_utils.py

update xblock only to mark field values as dirty if they've changed (TNL-2475)

2015-06-29 14:28:45 -04:00

tests.py

MA-612 Mobile Push Notification Studio Django admin setting

2015-04-18 15:30:14 -04:00

utils.py

Add CCX SQL query/mongo read tests

2015-06-15 09:50:44 -04:00