Don Mitchell
08aaa97bfb
Serialize course_key at last possible code junction
2014-05-20 11:58:03 -04:00
Calen Pennington
9ca09db469
Fix missing semicolon in annotation html
2014-05-19 15:34:29 -04:00
Calen Pennington
a3b6ef8bae
Rename variables to make type clearer
2014-05-19 10:58:38 -04:00
Calen Pennington
4df122a92e
Update annotations modules to use the course_id from the runtime, rather than extracting it from the page
2014-05-19 09:37:53 -04:00
Calen Pennington
2ce6719153
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-19 09:29:34 -04:00
Calen Pennington
8f72394e81
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/templates/widgets/header.html
2014-05-19 09:20:08 -04:00
Sarina Canelake
5fd2eef58d
Add Croatian language
2014-05-19 08:13:18 -04:00
Chris Rossi
db8b33d04d
Use path already created by ansible.
2014-05-16 16:37:39 -04:00
Chris Rossi
42e8e3068e
Use local storage instead of S3 for uploads in devstack.
2014-05-16 16:37:39 -04:00
Sarina Canelake
afac5145e3
Merge pull request #3757 from edx/sarina/fix-git_import
...
Sarina/fix git import
2014-05-16 16:12:33 -04:00
Calen Pennington
dd6609fa2c
Fix dashboard data tests
2014-05-16 15:38:59 -04:00
Calen Pennington
6d5478a483
Migrate new code from merge to use OK standards
2014-05-16 14:20:35 -04: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
Sarina Canelake
b3462d1c67
Fix issues with psychometrics and git import
2014-05-16 11:47:14 -04:00
Diana Huang
7a87179dc2
Update get_discussion_link command to use CourseKeys
2014-05-15 16:41:31 -04:00
David Adams
9bc7a518ee
Fixes issue with metrics tab click handlers
...
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
Added logic to attach handlers when elements are ready.
Added 2 buttons on metrics tab:
Download Subsection Data for downloading to csv.
Download Problem Data for downloading to csv.
2014-05-15 11:45:59 -07:00
Brian Wilson
aacbc5eddb
Merge branch 'release' (after release-2014-05-14).
2014-05-15 14:34:22 -04:00
Calen Pennington
77b895cb98
Merge pull request #3673 from cpennington/opaque-keys-merge-master
...
Merge master into opaque-keys
2014-05-15 13:24:50 -04:00
Calen Pennington
daf35bed8f
Fix instructor csv download
2014-05-15 10:30:36 -04:00
Calen Pennington
ff026ea8af
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
common/lib/xmodule/xmodule/video_module/video_handlers.py
2014-05-15 10:25:08 -04:00
brianhw
524079b42d
Merge pull request #3735 from edx/usman/lms2557-bulk-email-hack
...
Fix for bulk email not working in Firefox
2014-05-15 10:00:26 -04:00
Carson Gee
de637f329e
Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix
...
Fix bug affecting video transcripts in XMLModulesStore courses
2014-05-15 08:50:36 -04:00
Waheed Ahmed
6b84f8ab86
Fixed on instructor dash too.
2014-05-15 17:07:10 +05:00
Usman Khalid
7192fce2f5
A hack to get instructor email to work in Firefox while the video
...
annotator tool is refactored to not bundle its own tinymce globally.
2014-05-15 16:54:15 +05: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
ddf1874ca4
Fix merge conflicts
2014-05-14 15:59:25 -04:00
Calen Pennington
661f37ecd6
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
lms/djangoapps/instructor/tests/test_api.py
lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/legacy.py
2014-05-14 15:57:38 -04:00
Calen Pennington
44b15619e9
Fix spoc_gradebook
2014-05-14 15:23:58 -04:00
Carson Gee
52d8317ab5
Fix bug affecting video transcripts in XMLModulesStore courses
2014-05-14 15:19:15 -04:00
Stephen Sanchez
0a6ea26c25
Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv
...
Changing Student Anon ID Dump to return Course Specific IDs.
2014-05-14 15:04:42 -04:00
David Baumgold
59e3cae4c9
Revert pull request #3466
2014-05-14 13:55:26 -04:00
Julia Hansbrough
ce8e6cd0d0
Merge pull request #3711 from edx/flowerhack/fix-subhist
...
Fix improper parsing of location string
2014-05-14 11:19:12 -04:00
Adam
08eb8fa7c1
Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range
...
Adam/fix non ascii grade range
2014-05-14 10:52:28 -04:00
Calen Pennington
6ca0a7a1d6
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-14 10:00:25 -04:00
Calen Pennington
7e55d5eb5c
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
2014-05-14 10:00:16 -04:00
Stephen Sanchez
5cc41a6c9b
Changing Student Anon ID Dump to return Course Specific IDs.
2014-05-14 09:56:36 -04:00
Calen Pennington
ecdb9ec461
Address review comments
2014-05-14 09:37:38 -04:00
Waheed Ahmed
2b8fafec56
Text changed in admin_dashboard for course enrollments.
...
LMS-1596
2014-05-14 15:40:50 +05:00
Julia Hansbrough
542dff194e
Fix improper parsing of location string
2014-05-13 21:29:30 +00:00
Brian Talbot
2c9a7b51fd
Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images
...
FIX - LMS: Dashboard Course Image Dimensions
2014-05-13 16:35:58 -04:00
Brian Talbot
cd1ec5fd58
resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard
2014-05-13 16:25:44 -04:00
Calen Pennington
5c345b3b00
Fix more broken tests after merge from master
2014-05-13 16:21:18 -04:00
Adam Palay
9b313d732f
fix bug
2014-05-13 15:32:46 -04:00
Adam Palay
2b95b0ba36
add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687)
2014-05-13 15:32:23 -04:00
Calen Pennington
6c546fbf1f
Fix merge conflicts
2014-05-13 15:31:40 -04: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
Will Daly
c6a02870e1
Update instructor dash to support ora2 submissions API with opaque keys
2014-05-13 13:28:55 -04:00
Calen Pennington
a247bb7b9e
Fix StaffDebug javascript tests
2014-05-13 12:57:22 -04:00
Calen Pennington
6fcf65ef62
Fix staff debug view
2014-05-13 11:58:56 -04:00
