Rocky Duan 777c3ee42c Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/profile.html

2012-08-01 12:49:00 -04:00

..

djangoapps

djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4

2012-07-31 21:43:29 -04:00

lib

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

2012-08-01 12:49:00 -04:00

static

bug fix: resize input for defaulttext (tagsinput)

2012-07-31 14:03:55 -04:00

templates

Allow for modular css from XModules, and split capa module css out as a test

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

test

Formatting and little bugfixes

2012-07-27 16:09:25 -04:00