Waheed Ahmed
|
cc36162df1
|
Fixed links for units loaded via ajax.
LMS-2711
|
2014-06-02 14:19:19 +05:00 |
|
Calen Pennington
|
d4280e8529
|
Fix merge conflicts
|
2014-05-16 14:10:50 -04:00 |
|
Calen Pennington
|
18c91d0f1d
|
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
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
|
2014-05-16 14:01:20 -04:00 |
|
Waheed Ahmed
|
1648442052
|
Reset attempts, delete state and rescore buttons not working on staff debug.
LMS-2706
|
2014-05-15 12:47:51 +05:00 |
|
Calen Pennington
|
240d91daeb
|
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
cms/djangoapps/contentstore/management/commands/tests/test_import.py
cms/djangoapps/contentstore/tests/test_import.py
common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
lms/djangoapps/bulk_email/tests/test_course_optout.py
lms/djangoapps/bulk_email/tests/test_email.py
lms/djangoapps/bulk_email/tests/test_err_handling.py
lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/instructor/tests/test_email.py
lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
lms/djangoapps/instructor/tests/test_legacy_download_csv.py
lms/djangoapps/instructor/tests/test_legacy_email.py
lms/djangoapps/instructor/tests/test_legacy_enrollment.py
lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
lms/djangoapps/instructor/tests/test_legacy_gradebook.py
lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
lms/djangoapps/instructor/tests/test_legacy_reset.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/instructor/views/legacy.py
lms/templates/courseware/instructor_dashboard.html
|
2014-05-13 15:30:56 -04:00 |
|
Calen Pennington
|
6fcf65ef62
|
Fix staff debug view
|
2014-05-13 11:58:56 -04:00 |
|
Sarina Canelake
|
a5381db070
|
Only show banner on legacy dash for edx.org
LMS-1296
|
2014-05-12 12:42:19 -04:00 |
|
Carson Gee
|
7c1e6d83e4
|
Fix message handling to be more internationalizable
|
2014-05-09 11:21:39 -04:00 |
|
Carson Gee
|
b3ec4d1b6b
|
Switching to new dashboard API and adding rescore to actions list
|
2014-05-08 19:03:14 -04:00 |
|
Carson Gee
|
2998a2e9b7
|
Code review changes
i18n
|
2014-05-07 16:16:37 -04:00 |
|
Carson Gee
|
5775634482
|
Added jasmine tests and factored out javascript functions to new file
|
2014-04-23 14:56:32 -04:00 |
|