Calen Pennington 73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-26 09:05:57 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

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

djangoapps

Standardize how JS XModules are instantiated

2012-07-24 16:14:04 -04:00

envs

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -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

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -04:00

templates

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -04:00