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

5910 Commits

Author SHA1 Message Date
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
Ned Batchelder
cf6a83f4a4 Merge pull request #3730 from louyihua/localization-fix-video 
i18n: Make translation works for video editor tabs
 2014-05-20 14:22:40 -04:00
jmclaus
678a92b4b2 Added new error message that displays when HTML5 video is not supported altogether. Make sure spinner gets hidden when error message is shown. [BLD-638] 2014-05-20 19:17:57 +02:00
Anton Stupak
61414c7c92 Merge pull request #3715 from edx/anton/i18n-string-response 
StringResponse i18n.
 2014-05-20 19:51:50 +03:00
Anton Stupak
d8f1ebefb7 Merge pull request #3734 from edx/anton/i18n-custom-response 
CustomResponse: fix log message.
 2014-05-20 19:51:40 +03:00
Ned Batchelder
2c4fcb0c5b Slight tweak to get_text 2014-05-20 12:02:17 -04:00
louyihua
f3371643ee i18n: Make translation works for video editor tabs 
Now the display_name & help strings in video editor tabs can be extracted and translated.
 2014-05-20 11:20:22 +08:00
polesye
934b8dbcf9 Add translators. 2014-05-19 09:00:54 +03:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
polesye
237fca067f CustomResponse: fix log message. 2014-05-19 08:58:31 +03:00
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -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
Oleg Marshev
b9cd6cd6ec Add sjson and srt to type map. 2014-05-15 14:02:48 +03:00
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -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
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
Nick Parlante
c30665fb59 Merge pull request #3677 from edx/nick/fix-feedback-bug 
Fix targeted-feedback bug
 2014-05-12 15:23:44 -07:00
Nick Parlante
f48e470f54 Fix targeted-feedback bug 
The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.
 2014-05-12 14:26:05 -07:00
Adam
4ecf41126a Merge pull request #3626 from edx/adam/fix-import-bug 
fix importing bug (STUD-1599)
 2014-05-12 16:54:21 -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
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Adam Palay
e5fa0c5dd9 add max-attempts to inheritance.py (LMS-2130) 2014-05-12 15:55:15 -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
Anton Stupak
839887246c Merge pull request #3643 from edx/anton/fix-video-in-ff 
Anton/fix video in ff
 2014-05-12 10:24:47 +03:00
Sarina Canelake
b7003a1d76 Merge pull request #3672 from edx/sarina/fix-unicode 
Remove unicode character inserted into video_xfields
 2014-05-09 16:57:12 -04:00
ichuang
34c28cf42d Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid 
allow capa problems access to anonymous_student_id
 2014-05-09 16:21:36 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Adam
5b40604b1c Merge pull request #3671 from edx/adam/rebase/anton-fix-video-in-ff 
BLD-1057: Fix Video player in FF.
 2014-05-09 14:31:00 -05:00
Sarina Canelake
22d17a21ec Remove unicode character inserted into video_xfields 2014-05-09 15:25:56 -04:00
Dave St.Germain
eab8445eb1 Merge pull request #3156 from edx/dcs/LMS-1740 
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
 2014-05-09 14:28:24 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
polesye
18edab35f3 BLD-1057: Fix Video player in FF. 2014-05-09 08:54:09 -05:00
polesye
47ec168ea4 BLD-1057: Fix Video player in FF. 2014-05-09 15:00:18 +03:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -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
Diana Huang
4778eff817 Disable a flaky ORA Javascript test. 2014-05-07 14:51:27 -04:00
Anton Stupak
f2086f2336 Merge pull request #3586 from edx/anton/i18n-custom-response 
CustomResponse i18n.
 2014-05-07 15:13:13 +03:00
Anton Stupak
ed70a0823c Merge pull request #3608 from edx/anton/i18n-code-response 
CodeResponse i18n.
 2014-05-07 13:39:28 +03:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
Christina Roberts
ee0970fc04 Merge pull request #3616 from edx/christina/remove-template 
Christina/remove template
 2014-05-06 13:25:32 -04:00
cahrens
3c1b363c01 Remove (Grade Me!) template until it can be productized. 2014-05-06 11:49:54 -04:00
Waheed Ahmed
b873cfc26d Fixed simple editor text showing in advanced editor. 2014-05-06 20:35:38 +05:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd 
Drag and drop on container page
 2014-05-06 11:09:29 -04:00
Anton Stupak
4a80b14ade Merge pull request #3607 from edx/anton/i18n-symbolic-response 
SymbolicResponse i18n.
 2014-05-06 15:58:49 +03:00
polesye
d8e5647a10 BLD-721: SymbolicResponse i18n. 2014-05-06 12:46:33 +03:00