Calen Pennington 531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-13 12:18:04 -04:00

..

features

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

management

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-13 12:18:04 -04:00

migrations

Reorderd xmodule storage migrations

2013-03-06 08:45:32 -05:00

tests

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-08 00:40:18 -05:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

admin.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

courses.py

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

grades.py

Make default value for format setting None, and force lms and cms to be explicit about a string default

2013-03-12 10:16:14 -04:00

model_data.py

Fix tests except for conditional module and open ended grading

2013-03-05 15:04:59 -05:00

models.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

module_render.py

Make default value for format setting None, and force lms and cms to be explicit about a string default

2013-03-12 10:16:14 -04:00

progress.py

Cleaning up pep8 violations

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

tabs.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-12 07:23:28 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00