Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Sarina Canelake
0a30f24e26 Merge pull request #3754 from theJohnnyBrown/empty-course-error 
show a friendly message for an empty course rather than an error page
 2014-05-29 21:07:42 -04:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Alan Boudreault
57025cd5e6 Add missing mimetypes for xblock resources 2014-05-29 11:14:00 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
Diana Huang
eb8f696964 Merge pull request #3886 from edx/diana/clean-up-outdated-files 
Remove some outdated code.
 2014-05-27 09:35:22 -04:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
Julia Hansbrough
78ed9e9512 Fixed some TODOs, removed irrelevant ones 2014-05-24 19:36:24 -04:00
Sarina Canelake
46d7f99004 StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 19:36:18 -04:00
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -04:00
Julia Hansbrough
6f7bc7e174 Fixed some TODOs, removed irrelevant ones 2014-05-24 18:49:06 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Calen Pennington
8c8cf4705a Resolve conflicts 2014-05-23 11:39:17 -04:00
Calen Pennington
6225f4d0bd Merge remote-tracking branch 'edx/master' into ok-merge-from-master 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2014-05-23 11:38:33 -04:00
Stephen Sanchez
afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users 2014-05-23 09:23:21 -04:00
Diana Huang
db0cd78152 Remove some outdated code. 2014-05-22 15:39:29 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Calen Pennington
76235c1027 Allow cross course references in the LMS 2014-05-20 11:44:09 -04:00
Sarina Canelake
b3462d1c67 Fix issues with psychometrics and git import 2014-05-16 11:47:14 -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
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
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
Julia Hansbrough
542dff194e Fix improper parsing of location string 2014-05-13 21:29:30 +00: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
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
Carson Gee
f247adc4b7 Merge pull request #1 from edx/ned/tweaks-for-pr-3464 
Simple fixes
 2014-05-12 16:37:51 -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
Carson Gee
ff1564382d Corrected test names and doc strings 2014-05-12 13:41:23 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -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
Calen Pennington
c72b0bb293 Resolve merge conflicts relative to master 2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Don Mitchell
660f905028 Merge pull request #3658 from edx/opaque-keys-location-to-son 
Opaque keys location to son
 2014-05-09 10:48:51 -04:00