Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,250 Commits 1 Branch 0 Tags
ff026ea8af65cb824bc48de1aaf8ec792a058b95
Commit Graph

8255 Commits

Author SHA1 Message Date
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
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
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
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
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
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Calen Pennington
484c529d99 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-13 10:23:24 -04:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master 
Fix #3347: "Run Code" reloads page in Matlab Problem
 2014-05-13 19:06:40 +05:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00
Adam
7d6e3319eb Merge pull request #3595 from edx/adam/fix-typo-2 
put google analytics in quotation marks in linkedin email template
 2014-05-12 17:10:41 -04:00
Don Mitchell
741cdf9557 Merge pull request #3688 from edx/dhm/opaque-keys-bugs 
Dhm/opaque keys bugs
 2014-05-12 17:06:10 -04:00
Carson Gee
f247adc4b7 Merge pull request #1 from edx/ned/tweaks-for-pr-3464 
Simple fixes
 2014-05-12 16:37:51 -04:00
dragonfi
8430be3d18 Fix #3347: "Run Code" reloads page in Matlab Problem 
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.

This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.

Also tidies up indentation.
 2014-05-12 22:26:52 +02:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04:00
Ned Batchelder
2f7adda00d Simple fixes 
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
 2014-05-12 15:52:57 -04:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Greg Price
d9817117ed Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields 
Allow extra fields returned from comments service
 2014-05-12 14:42:26 -04:00
Julia Hansbrough
f6f802f3db Pass deprecated course keys through 2014-05-12 18:35:40 +00:00
Greg Price
57f14bded1 Allow extra fields returned from comments service 
Previously, an error was raised if the comments service returned data
including an unexpected field, which unnecessarily complicated the
release path for new features, since the list of allowed fields would
need to be modified before cs_comments_service could be modified, and
only then could edx-platform take advantage of the new CS feature. We
still log a warning if an unexpected field is returned, so we will
still be able to tell if the CS returns a corrupt response.

JIRA: FOR-180
 2014-05-12 13:49:24 -04:00
Carson Gee
ff1564382d Corrected test names and doc strings 2014-05-12 13:41:23 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org 
LMS-1296
 2014-05-12 12:42:19 -04:00
Calen Pennington
85ca7db7a6 Fix merge conflicts relative to master 2014-05-12 11:42:21 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Frances Botsford
b90f1e41e5 UI cleanup of new instructor dashboard 
Stylize warning banners; more UI touches for the intructor dash:
clean up nav structure, compact header so content is higher on the page

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
bc0c13828f Add segment.io tracking for legacy instructor dashboard 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard 
Fix acceptance and unit tests

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
c224fe57ef Add banners to the instructor dashboard 
Notification banner to default dash to announce the change

Warning banner on legacy instruction dashboard to explain it has been deprecated

LMS-1296
 2014-05-12 10:18:27 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash 
LMS-1296
 2014-05-12 10:18:27 -04:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
Calen Pennington
cbcb1059a3 fixup! Fix discussions by correctly serializing outgoing course_ids 2014-05-09 16:47:39 -04:00