marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2013-10-01 17:05:02 -04:00

..

analytics

Use XBlock 0.3

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

branding

Removed hardcoded case for edge for /courses

2013-09-23 15:30:00 +00: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

add unicode support for course_wiki

2013-09-23 16:15:47 -04:00

courseware

make ENABLE_SHOPPING_CART truly optional

2013-09-30 09:09:17 -07:00

dashboard

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

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

debug

Add a management command to dump xml courses

2013-09-27 10:57:39 -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 course enrollment count in instructor dashboard

2013-09-30 11:41: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

Clean up open ended problems view and fix error.

2013-09-27 16:02:12 -04:00

psychometrics

Change wildcard imports into specific imports

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

shoppingcart

Stanford paid course registration

2013-09-26 18:25:00 -07:00

static_template_view

Remove static_template_view tests

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

staticbook

Fixed tests name in staticbook

2013-09-23 12:58:14 +00:00

user_api

make user_api compatible with HTTP basic auth

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

verify_student

Clean up some old pep8/pylint violations

2013-09-24 17:12:31 -04:00