Rocky Duan c43d5d236a Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 ...

Conflicts:
	lms/static/coffee/src/discussion.coffee

2012-07-31 13:43:53 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

2012-07-10 16:22:05 -04:00

djangoapps

make search bar configurable

2012-07-31 13:26:36 -04:00

envs

Merge branch 'master' of github.com:MITx/mitx into discussion2

2012-07-31 11:26:17 -04:00

lib

basic error handling

2012-07-30 17:16:44 -04:00

static

Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2

2012-07-31 13:43:53 -04:00

templates

Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2

2012-07-31 13:43:53 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

Merge branch 'master' of github.com:MITx/mitx

2012-07-30 17:41:19 -04:00