Diana Huang 47ce9082e4 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py

2013-09-13 17:15:44 -04:00

..

analytics

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

branding

fix bug with anonymous access to / with future start courses

2013-09-12 11:43:21 -07:00

bulk_email

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

certificates

Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi

2013-08-28 10:56:07 -04:00

circuit

Remove pointless addition tests

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

course_wiki

Removed unnecessary settings wrangling from ModuleStoreTestCase.

2013-08-21 09:36:45 -04:00

courseware

Merge branch 'release'

2013-09-13 17:15:44 -04:00

dashboard

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

debug

Remove unused imports from lms, as detected by pylint.

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

django_comment_client

Merge pull request #844 from edx/dhm/editable_metadata

2013-09-06 11:58:36 -07:00

foldit

change models to filter by course

2013-07-19 11:03:25 -04:00

instructor

fix-setattr-and-getattr

2013-09-13 14:44:49 -04:00

instructor_task

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

licenses

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

lms_migration

fix-setattr-and-getattr

2013-09-13 14:44:49 -04:00

multicourse

Remove simplewiki from the codebase

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

notes

Add a manage.py command that understands the extra edX options

2013-07-24 09:04:12 -04:00

notification_prefs

notification_prefs/views: correct docstring

2013-07-30 02:30:45 -04:00

open_ended_grading

Address review comments

2013-09-13 11:06:40 -04:00

psychometrics

Change wildcard imports into specific imports

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

shoppingcart

Merge branch 'release'

2013-09-12 16:03:39 -04:00

static_template_view

Remove static_template_view tests

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

staticbook

Pep8/pylint fixes

2013-08-21 19:42:59 -04:00

user_api

make user_api compatible with HTTP basic auth

2013-07-30 17:13:48 -04:00

verify_student

Make sure our JSON messages output unescaped UTF-8 text, to match Software Secure expectations.

2013-09-13 15:20:08 -04:00