Vik Paruchuri 915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-07-18 11:55:37 -04:00

..

branding

Redirect from LMS courses page to marketing courses page

2013-05-07 13:06:38 -04:00

certificates

Merge pull request #292 from edx/ned/remove-pointless-addition-tests

2013-06-27 13:31:36 -07:00

circuit

Remove pointless addition tests

2013-06-27 16:27:39 -04:00

course_wiki

Refactored out full from the lms tests

2013-07-11 10:12:06 -04:00

courseware

Merge pull request #419 from edx/dhm/template_acceptance

2013-07-17 10:13:58 -07:00

dashboard

Remove pointless addition tests

2013-06-27 16:27:39 -04:00

debug

Remove unused imports from lms, as detected by pylint.

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

django_comment_client

pep8 fixes

2013-06-28 18:00:41 -04:00

foldit

Merge pull request #216 from edx/ned/remove-unused-imports

2013-06-20 14:15:31 -07:00

instructor

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

instructor_task

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

licenses

Remove unused imports from lms, as detected by pylint.

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

lms_migration

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

multicourse

Remove simplewiki from the codebase

2013-06-20 09:06:29 -04:00

notes

Remove unused imports from lms, as detected by pylint.

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

open_ended_grading

Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe

2013-07-18 11:55:37 -04:00

psychometrics

Change wildcard imports into specific imports

2013-06-21 17:33:06 -04:00

static_template_view

Remove static_template_view tests

2013-07-09 12:54:50 -04:00

staticbook

Add tests for image books, and more tests for the other kinds too.

2013-07-03 14:42:41 -04:00