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

..

management

Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again

2012-07-02 11:15:37 -04:00

migrations

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

__init__.py

Moving LMS code into subdirectory

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

admin.py

Moving LMS code into subdirectory

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

course_settings.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

courses.py

Address review comments

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

grades.py

Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors

2012-07-02 10:31:26 -04:00

models.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

module_render.py

make course id available in xmodule

2012-07-25 18:15:52 -04:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Merge branch 'lol'

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