Calen Pennington 80b8529f2f Merge branch 'hotfix/1.0.4' ...

Conflicts:
	common/djangoapps/util/middleware.py

2012-08-08 11:05:26 -04:00

..

askbot/skins

Sorta fix askbot

2012-07-31 16:29:01 -04:00

djangoapps

re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE

2012-08-07 15:01:12 -04:00

envs

Merge branch 'hotfix/1.0.4'

2012-08-08 11:05:26 -04:00

lib

Move I4xSystem into xmodule so that the definition is available to the CMS

2012-07-24 15:05:07 -04:00

static

Make the modal window work in the courseware

2012-08-07 11:59:49 -04:00

templates

improve staff_problem_info jquery, so the histogram is also toggled

2012-08-07 18:36:04 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

urls.py

Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading

2012-08-06 16:49:05 -04:00