Sarina Canelake
2aea261d48
Merge branch 'release'
...
Conflicts:
common/djangoapps/course_modes/views.py
common/djangoapps/student/tests/test_roles.py
common/djangoapps/student/views.py
common/lib/opaque_keys/opaque_keys/__init__.py
common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
common/lib/xmodule/xmodule/contentstore/mongo.py
lms/djangoapps/certificates/management/commands/gen_cert_report.py
lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
Don Mitchell
acc02b0e09
Fix to excess asset query
2014-06-09 15:13:23 -04:00
Ned Batchelder
ec5aee2949
Remove duplicates in a class list so tests aren't duplicated
2014-06-06 13:17:36 -04:00
polesye
7b2d67f209
BLD-1049: Allow the video player to work with redirected links.
2014-06-05 09:34:54 +03: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
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
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
8699a13b09
Use old deprecated form for instructor api calls, and in staff debug info
2014-05-22 11:24:05 -04:00
Calen Pennington
4af2249a9d
Remove dead code
2014-05-21 14:28:04 -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
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
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
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
Don Mitchell
ae99a1700a
Merge pull request #3659 from edx/opaque-keys-validate
...
Opaque keys validate
2014-05-09 10:47:41 -04:00
Don Mitchell
7be81341d7
Revert StudentModule.module_state_key to field rather than computed property
2014-05-09 10:41:12 -04:00
Don Mitchell
b89b1e0727
Merge pull request #3657 from edx/opaque-keys-access
...
Don't fetch the course just to find out if the user has access to it.
2014-05-09 10:30:09 -04:00
Nimisha Asthagiri
46a976d7e1
fixed asset search query.
...
moved location_to_son to LocationBase.py.
2014-05-09 10:28:34 -04:00
Don Mitchell
69a2d9882e
Validate the args to SSCK
2014-05-09 10:26:06 -04:00
Don Mitchell
f73939ab7d
Responses to comments on https://github.com/edx/edx-platform/pull/3539
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/locations.py
2014-05-09 10:18:22 -04:00
Don Mitchell
6834376b8a
Don't fetch the course just to find out if the user has access to it.
2014-05-09 10:12:21 -04:00
Carson Gee
c0644dc984
Only do static transcript redirect for english language, and don't offer static redirect for download
...
Rename video test to real YouTube-ID
2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e
Add last resort method to download and showing of video transcript
2014-05-07 15:11:41 -04:00
Calen Pennington
9811926d97
Make course ids and usage ids opaque to LMS and Studio [partial commit]
...
This commit updates lms/djangoapps/courseware.
These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).
For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.
Co-Author: Andy Armstrong <andya@edx.org >
Co-Author: Christina Roberts <christina@edx.org >
Co-Author: David Baumgold <db@edx.org >
Co-Author: Diana Huang <dkh@edx.org >
Co-Author: Don Mitchell <dmitchell@edx.org >
Co-Author: Julia Hansbrough <julia@edx.org >
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org >
Co-Author: Sarina Canelake <sarina@edx.org >
[LMS-2370]
2014-05-06 10:08:32 -04:00
cahrens
7e05f3cdab
pep8/pylint cleanup
2014-05-02 15:36:22 -04:00
cahrens
1e92a6c884
Do not show "View in Studio" links for child verticals of verticals.
...
STUD-1558
2014-05-02 13:36:44 -04:00
Jason Bau
f8c062b6ce
lti 2.0 result service rest endpoint
2014-04-29 12:01:12 -07:00
Carson Gee
c4ea338035
Additional logic to handle more course_image URL edge cases
...
This changes logic to allow more missed use cases of course_image to
work properly. The cases are:
. XML courses with the course_image attribute set
. Mongo courses that are imported without a contentstore
. Mongo courses that have course_image set but don't have a content store
It also exports default images_static_course.jpg to
images/static_course.jpg to handle a use case where a course author
uploaded an image to the default location in studio without using the
studio interface for adding course images, they then export the course, and then
import it without a contentstore
2014-04-24 16:54:40 -04:00
polesye
127bf7ed3f
BLD-1000: Download handout.
2014-04-22 21:44:36 +03:00
Oleg Marshev
015bd57d02
Remove double quoting.
2014-04-08 15:21:31 +03:00
Oleg Marshev
8a2024241e
Add context_id.
2014-04-08 14:09:52 +03:00
