Rocky Duan 52c7136493 Merge branch 'lol' ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html

2012-07-25 18:41:24 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

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

djangoapps

Merge branch 'lol'

2012-07-25 18:41:24 -04:00

envs

add discussion app & url conf

2012-07-25 18:09:34 -04:00

lib

move comment client in place

2012-07-25 18:26:41 -04:00

static

Merge branch 'lol'

2012-07-25 18:41:24 -04:00

templates

fixed discussion & news styling

2012-07-25 18:36:36 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

show news & options when submit comment

2012-07-25 18:16:57 -04:00