- 06 Mar, 2013 4 commits
-
-
Conflicts: cms/djangoapps/contentstore/views.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py common/lib/xmodule/xmodule/peer_grading_module.py
Calen Pennington committed -
Calen Pennington committed
-
Vasyl Nakvasiuk committed
-
Vasyl Nakvasiuk committed
-
- 05 Mar, 2013 26 commits
-
-
Brian Wilson committed
-
Feature/vik/advanced studio
Christina Roberts committed -
Calen Pennington committed
-
Calen Pennington committed
-
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
Arthur Barrett committed -
removed un-enroll all button for fear of disaster
Victor Shnayder committed -
Feature/deena/testing
Will Daly committed -
Jay Zoldak committed
-
Vasyl Nakvasiuk committed
-
Jay Zoldak committed
-
Don't collapse multiple underscores for asset names.
chrisndodge committed -
#202
cahrens committed -
Arthur Barrett committed
-
Arthur Barrett committed
-
Selenium tests to go with pull request 1577 (bug #216)
Christina Roberts committed -
Brian Talbot committed
-
Vik Paruchuri committed
-
Will Daly committed
-
Will Daly committed
-
of the tests fail. Deleted some tests.
Will Daly committed -
cahrens committed
-
Vasyl Nakvasiuk committed
-
additional courseware view optimizations. Do a 'depth' fetch on the sele...
chrisndodge committed -
Chris Dodge committed
-
- 04 Mar, 2013 10 commits
-
-
A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors.
Vik Paruchuri committed -
Cast cursor responses as lists. MySQL returns them as tuples.
Victor Shnayder committed -
Removed print statemetns Moved import call to top of file
John Hess committed -
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Brian Talbot committed
-
cahrens committed
-
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
Calen Pennington committed -
Conflicts: cms/djangoapps/contentstore/tests/factories.py lms/djangoapps/courseware/tests/test_access.py
Will Daly committed
-
