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

..

cache_toolbox

Remove unused imports from common, as reported by pylint.

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

contentserver

remove debugging logging

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

course_groups

Pep8/pylint fixes

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

course_modes

Merge branch 'master' into ormsbee/verifyuser3

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

datadog

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

django_comment_common

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

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

django_future

Cleaning up pep8 violations

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

external_auth

Common djangoapps no longer access courseware; other cleanup

2013-08-22 14:08:35 -04:00

heartbeat

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

mitxmako

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

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_mako

Move underscore templates into separate files, included in Mako templates

2013-05-22 15:55:50 -04:00

request_cache

use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down

2013-03-27 22:37:07 -04:00

service_status

Add status app with simple view to check celery workers

2013-05-17 11:33:14 -04:00

static_replace

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

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

status

Remove unused imports from common, as reported by pylint.

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

student

Merge branch 'master' into ormsbee/verifyuser3

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

terrain

Merge branch 'master' into ormsbee/verifyuser3

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

track

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

util

add simple unit test on the defaulting of the settings

2013-07-11 14:31:53 -04:00

tests.py

No longer persist XModule templates

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

xmodule_modifiers.py

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-19 08:24:35 -04:00