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

Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py

2013-08-19 08:24:35 -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

certificates

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

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

circuit

Remove pointless addition tests

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

course_modes

Add admin site for CourseMode

2013-08-14 15:13:11 -04:00

course_wiki

be sure to encode the display strings

2013-08-02 09:56:19 -04:00

courseware

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

2013-08-19 08:24:35 -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

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

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

foldit

change models to filter by course

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

instructor

change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration

2013-08-15 22:58:04 -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

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 #621 from edx/fix/vik/oe-issues

2013-08-15 08:27:34 -07: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

fix tests

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

user_api

make user_api compatible with HTTP basic auth

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