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

..

admin

Moving LMS code into subdirectory

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

coffee

show news & options when submit comment

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

contrib

Moving LMS code into subdirectory

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

css/vendor

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

fonts

Moving LMS code into subdirectory

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

images

Fixing up cms tests to only use data in common/test/data

2012-07-25 10:09:25 -04:00

images_old

Modularize sequence css

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

js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

sass

Merge branch 'lol'

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

staff

Moving LMS code into subdirectory

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

.gitignore

Ignoring ie.css

2012-07-22 15:27:49 -04:00

.hgignore

Moving LMS code into subdirectory

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

green-pointer.png

Moving LMS code into subdirectory

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

pixel.jpg

Moving LMS code into subdirectory

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