David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

analytics

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

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

branding

WIP

2013-08-15 22:58:02 -04:00

bulk_email

remove vestigal references to fake_smtp_server

2013-08-30 13:46:04 -07: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 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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

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

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

foldit

change models to filter by course

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

instructor

Slightly change email registration template

2013-08-29 15:27:30 -07:00

instructor_task

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

licenses

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

2013-08-27 16:21:33 -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

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

Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests

2013-08-23 08:38:09 -07:00

psychometrics

Change wildcard imports into specific imports

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

shoppingcart

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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 users are logged in on the verified cert path

2013-08-30 13:58:36 -04:00