Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Browse Source 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
This commit is contained in:
Calen Pennington
2014-05-16 14:01:20 -04:00
parent af8cab2a37 6396373bd5
commit 18c91d0f1d
49 changed files with 1226 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/static/js/staff_debug_actions.js
View File

@@ -114,6 +114,7 @@ var StaffDebug = (function(){
// Register click handlers
$(document).ready(function() {
<<<<<<< HEAD
$('#staff-debug-reset').click(function() {
StaffDebug.reset($(this).parent().data('location-name'), $(this).parent().data('location'));
return false;
@@ -124,6 +125,18 @@ $(document).ready(function() {
});
$('#staff-debug-rescore').click(function() {
StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
=======
$('.staff-debug-reset').click(function() {
StaffDebug.reset($(this).data('location'));
return false;
});
$('.staff-debug-sdelete').click(function() {
StaffDebug.sdelete($(this).data('location'));
return false;
});
$('.staff-debug-rescore').click(function() {
StaffDebug.rescore($(this).data('location'));
>>>>>>> edx/master
return false;
});
});