Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,719 Commits 1 Branch 0 Tags
0103700a7856ccd2a32e75974b64521eeecad631
Commit Graph

6050 Commits

Author SHA1 Message Date
Nick Parlante
0039536fe2 Merge pull request #3872 from edx/nick/disable-masking 
Temporarily disable masking
 2014-06-02 13:21:47 -07:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
Anton Stupak
007fde03a1 Merge pull request #3951 from edx/anton/fix-relative-time 
RelativeTime: incorrect value after XML serialization.
 2014-06-02 20:11:37 +03:00
Sarina Canelake
31274a52dc Merge pull request #3480 from lduarte1991/lduarte-harvardx2 
Annotation Tool Clean up and Plugins
 2014-06-02 11:40:12 -04:00
srpearce
f33eb60c56 Merge pull request #3938 from edx/sylvia/docs/BLD-1049 
Sylvia/docs/bld 1049
 2014-06-02 11:29:26 -04:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes 
Making sure extension comes after annotator css
 2014-06-02 10:45:29 -04:00
lduarte1991
88d8813942 Diacritic Plugin for Annotator Tool: Added studio input 2014-06-02 10:45:29 -04:00
polesye
865b69361f BLD-1060: Fix RelativeTime. 2014-06-02 16:48:59 +03:00
Anton Stupak
ee368da66b Merge pull request #3946 from edx/anton/i18n-code-response 
CodeResponse: fix i18n.
 2014-06-02 16:32:45 +03:00
polesye
73df5a9343 BLD-724: ChoiceTextResponse i18n. 2014-06-02 09:22:25 +03:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Sylvia Pearce
09efc6790c Add note strongly recommending .webm and .mp4 video format 2014-05-30 15:13:16 -04:00
Dave St.Germain
ed9ab3ad71 Merge pull request #3501 from edx/dcs/matlab-api-key 
Allow courses to set Matlab API key globally, in advanced settings.
 2014-05-30 11:40:32 -04:00
David Baumgold
30dd47a62c Merge pull request #3907 from lduarte1991/lduarte-harvardx-image2 
Annotation Tools: Load Tinymce in student_view
 2014-05-30 10:51:46 -04:00
Oleg Marshev
daf4840cb6 Add span tag. 2014-05-30 10:30:23 +03:00
Nick Parlante
3ef1e0f7ad Temporarily disable capa name masking 
There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.
 2014-05-29 22:12:43 -07: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
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
lduarte1991
a4c912a05b Annotation Tools: Fixing tests for student_view 
Fixed typo from autocomplete

Fixed dict for tests
 2014-05-29 11:34:40 -04:00
lduarte1991
1d6f3c631d Annotation Tools: Load Tinymce in student_view 2014-05-29 11:34:40 -04:00
Don Mitchell
701eac33ec get_courses doesn't return ErrorDescriptor 2014-05-29 11:01:56 -04:00
Calen Pennington
81d785d192 Merge pull request #3862 from cpennington/external-opaque-keys 
Extract opaque_keys into a separate library
 2014-05-29 10:21:48 -04:00
Don Mitchell
c37e241230 Make reverse matching robust to errored courses 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-05-29 10:17:24 -04:00
Anton Stupak
50e820db4e Merge pull request #3916 from edx/anton/fix-choice-text-response 
Fix ChoiceTextResponse.
 2014-05-29 15:56:30 +03:00
jmclaus
f45dc94930 JavascriptResponse i18n. [BLD-737] 2014-05-29 13:49:04 +02:00
Anton Stupak
79a0cd2445 Merge pull request #3902 from edx/anton/i18n-choice-group 
ChoiceGroup  i18n.
 2014-05-29 11:47:09 +03:00
polesye
1f7d59de5b BLD-1103: Fix ChoiceTextResponse. 2014-05-29 11:03:15 +03:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
Dave St.Germain
964e73f053 Allow courses to set Matlab API key globally, in advanced settings. 2014-05-28 15:32:46 -04:00
David Adams
54e1faea47 Merge pull request #3394 from edx/dcadams/parse_query_params 
Parse urls with query params for ^/static
 2014-05-28 10:59:54 -07:00
David Adams
384bac2f0e Parse urls with query params for ^/static 
Query params with a value that starts with /static should have their values converted to the full location.
  Query params with a value that does not start with /static should be left unchanged.
 2014-05-28 10:21:55 -07:00
jmclaus
d6a54c697d i18n of Image Response [BLD-723] 2014-05-28 18:37:16 +02:00
Don Mitchell
ca66d98236 Merge pull request #3900 from edx/dhm/test_has_course 
Add tests for has_course
 2014-05-28 11:56:32 -04:00
Don Mitchell
eeac479c02 Merge pull request #3901 from edx/dhm/opaque-dont-skip 
Dhm/opaque dont skip
 2014-05-28 11:56:03 -04:00
Calen Pennington
ed7a631c80 Extract opaque_keys into a separate library 
[LMS-2571]
 2014-05-28 11:40:19 -04:00
Andy Armstrong
9148d2e1ff Merge pull request #3875 from louyihua/translation-fix 
i18n: Make values that has 'display_name' be displayed localized in editor
 2014-05-28 10:59:04 -04:00
polesye
71b90a918d BLD-725: ChoiceGroup i18n. 2014-05-28 16:03:14 +03:00
Don Mitchell
58198b91d4 Merge pull request #3899 from edx/opaque-keys 
Opaque keys
 2014-05-28 08:58:01 -04:00
Don Mitchell
62e7ecc5dd Merge pull request #3745 from edx/dhm/no-package-id 
Dhm/no package
 2014-05-28 08:37:08 -04:00
Don Mitchell
c536846291 Add tests for has_course 
and negative tests for get_course.
 2014-05-28 08:34:44 -04:00
Don Mitchell
62bccd4e93 Split mongo correctly serializes and deserialized references 
STUD-1592, STUD-1603, LMS-2642
 2014-05-28 08:29:13 -04:00
Waheed Ahmed
6ad6f77ca2 Cheatsheet visibility code refactored. 2014-05-28 12:07:59 +05:00
Don Mitchell
9d2db736df Merge pull request #3869 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:57:15 -04:00
Greg Price
f25dd8dd8b Merge pull request #3888 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:51:50 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
Anton Stupak
29ec66facd Merge pull request #3885 from edx/anton/fix-video-outline 
Remove Video player outline.
 2014-05-27 16:41:30 +03: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
Andy Armstrong
c5d23b4aa7 Merge pull request #3876 from louyihua/localization-fix-video 
i18n: Fix an i18n string extraction problem in 02_html5_video.js
 2014-05-27 09:05:48 -04:00