thomasxiii 258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style ...

A bunch of various fixes and de-styling

2012-08-07 10:20:10 -07:00

..

askbot/skins

Sorta fix askbot

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

djangoapps

Merge master

2012-08-07 11:51:44 -04:00

envs

Make tests pass again

2012-08-07 11:06:47 -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

Merge pull request #349 from MITx/feature/kfiedler/courseware-style

2012-08-07 10:20:10 -07: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