Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.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/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
..
2013-01-24 15:14:34 -05:00
2013-03-04 16:33:40 -05:00
2013-03-01 16:33:27 -05:00
2012-10-18 14:28:15 -04:00
2013-02-19 15:21:09 -05:00
2012-10-15 18:46:31 -04:00
2013-02-20 13:28:37 -05:00
2013-02-20 18:04:25 -05:00
2012-10-18 14:28:15 -04:00
2012-08-20 16:10:17 -04:00
2013-02-28 20:44:18 -05:00
2013-02-27 10:05:58 -05:00
2012-09-13 12:38:28 -04:00
2013-01-03 10:43:03 -05:00
2013-02-28 11:11:57 -05:00
2012-08-08 14:13:20 -04:00
2013-02-08 23:59:39 -05:00
2013-02-07 18:21:50 -05:00
2013-02-13 16:05:12 -05:00
2013-02-13 16:48:58 -05:00
2013-02-15 18:48:39 +02:00
2013-02-15 18:48:39 +02:00
2013-02-13 14:13:22 -05:00
2013-01-29 16:47:09 -05:00
2012-10-18 12:20:52 -04:00
2012-08-22 16:15:24 -04:00
2012-08-01 14:59:55 -04:00
2013-02-20 17:50:23 -05:00
2013-02-25 17:28:22 -05:00
2013-02-25 18:18:46 -05:00
2013-02-25 18:18:46 -05:00
2013-01-25 13:31:23 -05:00
2012-10-30 16:05:06 -04:00
2013-01-15 12:55:13 +02:00
2012-08-29 10:29:42 -04:00
2013-02-27 10:05:58 -05:00
2012-09-24 09:22:35 -04:00
2012-09-13 11:39:32 -04:00
2013-02-06 15:23:11 -05:00
2012-09-06 15:12:19 -04:00
2012-08-22 14:05:19 -04:00
2012-11-09 18:18:36 -05:00
2013-02-13 11:29:18 -05:00
2013-01-03 10:43:03 -05:00
2013-01-10 19:00:02 -05:00
2013-02-09 00:44:50 -05:00
2013-02-09 11:14:12 -05:00
2013-02-21 10:17:08 -05:00
2013-02-09 08:46:24 -05:00
2013-02-20 16:30:44 -05:00
2013-02-15 18:48:39 +02:00
2012-11-19 10:28:40 -05:00
2013-01-29 16:30:41 -05:00
2013-03-04 10:57:25 -05:00
2012-09-04 20:53:51 -04:00
2013-02-09 09:06:14 -05:00
2013-02-09 09:06:14 -05:00
2013-02-01 15:15:42 -05:00
2012-10-01 15:17:41 -04:00
2013-02-05 22:24:20 -05:00
2013-03-04 16:33:40 -05:00
2013-02-27 17:09:50 -05:00
2012-09-19 17:37:15 -04:00
2012-10-11 14:02:13 -04:00
2013-01-24 01:18:10 -05:00
2012-08-17 15:46:09 -04:00
2012-10-01 15:17:41 -04:00
2013-02-07 15:12:30 -05:00
2013-02-14 11:22:14 +02:00
2012-08-29 10:29:42 -04:00