David Ormsbee fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass ...

Force it to do expanded mode, because it's still generating compressed CSS output

2013-02-04 15:04:03 -08:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging

2013-02-04 17:18:59 -05:00

envs

Merge pull request #1420 from MITx/debug/dave/sass

2013-02-04 15:04:03 -08:00

lib

Merge remote-tracking branch 'origin/master' into feature/kevin/groups

2013-01-23 16:26:06 -05:00

static

Fix JS on after event handling

2013-02-04 17:41:44 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging

2013-02-04 17:18:59 -05:00

__init__.py

Moving LMS code into subdirectory

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

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging

2013-02-01 18:32:48 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00