Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,469 Commits 1 Branch 0 Tags
1a844a006e459b93d052d6fef4d69b3ef7cd58c3
Commit Graph

11117 Commits

Author SHA1 Message Date
Anton Stupak
ee368da66b Merge pull request #3946 from edx/anton/i18n-code-response 
CodeResponse: fix i18n.
 2014-06-02 16:32:45 +03:00
Anton Stupak
1a9f98b2dd Merge pull request #3895 from edx/anton/i18n-choice-text-response 
BLD-724: ChoiceTextResponse i18n.
 2014-06-02 15:11:16 +03:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cc36162df1 Fixed links for units loaded via ajax. 
LMS-2711
 2014-06-02 14:19:19 +05:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05: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
Adam Palay
cdad4a3257 load js without specifying protocol 2014-05-30 14:02:43 -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
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
muhammad-ammar
026c6523e8 Merge pull request #3882 from edx/ammar/test-youtube-availibility 
Check YouTube Availability for Video Tests
 2014-05-29 23:53:58 +05:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -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
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Don Mitchell
701eac33ec get_courses doesn't return ErrorDescriptor 2014-05-29 11:01:56 -04:00
Jay Zoldak
721732bf27 Merge pull request #3920 from edx/zoldak/increase-test-async-timeout 
Increase async script timeout in lettuce tests
 2014-05-29 10:44:37 -04:00
Jay Zoldak
e16fb6a630 Merge pull request #3921 from edx/zoldak/increase-test-wait-for-default-timeout 
Increase the default timeout for waiting in lettuce tests
 2014-05-29 10:43:57 -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
Jay Zoldak
40884a5085 Increase the default timeout for waiting in lettuce tests 2014-05-29 09:35:51 -04:00
Jay Zoldak
11fbaa19bf Increase async script timeout in lettuce tests 2014-05-29 09:05:31 -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
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
Usman Khalid
3aa4598956 Merge pull request #3879 from edx/usman/lms2747-anonymous-ids-collection 
Do not persist anonymous ids when exporting for all students of a course.
 2014-05-29 16:18:43 +05: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
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course. 
For large courses this causes export to take a long time and to time out.

LMS-2747
 2014-05-28 20:48:43 +05: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