Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,662 Commits 1 Branch 0 Tags
05e55641eb2d99bd75e31fcf9a115cf04edc66ce
Commit Graph

5805 Commits

Author SHA1 Message Date
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints 
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
 2014-04-22 12:03:43 -04:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
ichuang
f91b96565d bugfix: allow multiple choice questions to display hints 2014-04-21 22:03:26 -04:00
Valera Rozuvan
9e8941f357 Fix for BLD-993 
In certain cases jQuery errors when it is passed an invalid
selector. A fix for this is to silently catch these errors.

Jasmine tests were added to prevent this bug in the future.

BLD-993
 2014-04-16 14:26:05 +03:00
Nick Parlante
f1eefc1117 Merge pull request #1499 from edx/nick/shuffle-question 
Shuffle feature for multiple choice questions
 2014-04-14 22:02:14 -07:00
Nick Parlante
ab7d3b526b Multiple-choice features 
Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)
 2014-04-14 15:48:29 -07:00
Chris Dodge
0a839d9f01 Merge branch 'master' of github.com:edx/edx-platform 2014-04-14 14:17:49 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release' 
Conflicts:
	cms/templates/widgets/source-edit.html
 2014-04-14 14:17:03 -04:00
polesye
78996a9c1f Fix unit test. 2014-04-14 19:14:47 +03:00
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when 
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
 2014-04-14 10:26:30 -04:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks 
Temporarily disable CAPA problem "Check" button.
 2014-04-10 11:37:52 -04:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing 
Add "Edit" button to each leaf xblock on the container page
 2014-04-10 09:29:32 -04:00
Anton Stupak
a84bca233f Merge pull request #3246 from edx/anton/i18n-lti 
LTI i18n
 2014-04-09 17:59:27 +03:00
Andy Armstrong
b779b8a6fb Add unit tests for custom tabs and modal titles 2014-04-09 10:32:13 -04:00
Andy Armstrong
5ab159b079 Try to fix the failing JavaScript test 2014-04-09 10:32:12 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
polesye
c0110c2ba6 Removed unused helpers. 2014-04-09 12:16:22 +03:00
polesye
192af7a8e0 Update docstrings. 2014-04-09 12:16:22 +03:00
polesye
f454e10e71 Add fixes. 2014-04-09 12:16:22 +03:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
polesye
31e9152936 BLD-753: Add i18n for LTI. 2014-04-09 12:12:52 +03:00
Oleg Marshev
c515b9cb38 Remove params from list. 2014-04-09 11:35:59 +03:00
Diana Huang
9c0ec682af Merge pull request #3256 from edx/diana/fix-grading-service-login 
Return correct response when using _try_with_login
 2014-04-08 12:02:40 -04:00
Diana Huang
ef3a2b8545 Use the correct response when using login. 2014-04-08 11:18:55 -04:00
Sarina Canelake
f617047f28 Explicitly declare tags in dog stats increment calls 2014-04-08 10:38:14 -04:00
Will Daly
ffeb2f22bc Merge pull request #3242 from edx/will/studio-import-private-fix 
Allow import of native XBlocks in draft
 2014-04-08 10:02:31 -04:00
Oleg Marshev
015bd57d02 Remove double quoting. 2014-04-08 15:21:31 +03:00
Will Daly
08413afdfd Allow import of native XBlocks in draft 
Added tests for importing a pure XBlock
 2014-04-08 07:52:11 -04:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768). 
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
 2014-04-08 13:03:22 +03:00
Will Daly
5b305476a3 Merge pull request #3225 from edx/will/studio-import-xblock-fixes 
Explicitly re-save XBlock fields during import
 2014-04-07 15:23:53 -04:00
Graham Lowe
5e0849d214 Temporarily disable CAPA problem "Check" button. 
- update appropriate jasmine tests so that stubbed $postWithPrefix
respects a subset of jQuery promise API.
- add customization for checking state.
- display checking state while button is disabled.
- ensure checking state lasts for at least a second.
 2014-04-07 13:17:43 -04:00
Will Daly
38f819d181 Explicitly re-save XBlock fields during import 2014-04-07 11:49:27 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Anton Stupak
ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor 
Refactor video caption module.
 2014-04-04 13:03:02 +03:00
Julia Hansbrough
dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics 
XModule datadog metrics
 2014-04-03 16:04:06 -04:00
Julia Hansbrough
aa41635f79 XModule datadog metrics 2014-04-03 18:31:44 +00:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing 
Upgrade pyparsing to 2.0.1
 2014-04-03 13:02:54 -04:00
polesye
2f572a86ea Refactor video caption module. 2014-04-03 15:40:59 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 
Alex/display native language 2
 2014-04-03 15:06:04 +03:00
Valera Rozuvan
65a9ce24dd Merge pull request #3170 from edx/valera/remove_ipython_dependent_methods 
Remove a method call which depends on IPython.
 2014-04-02 23:18:51 +03:00
David Baumgold
cb5e3c8111 Upgrade pyparsing to 2.0.1 2014-04-02 16:09:53 -04:00
Calen Pennington
af486423c8 Merge pull request #3179 from cpennington/problem-check-metrics 
Rename metrics so that we capture checks as well as scores and number of attempts
 2014-04-02 15:34:00 -04:00
Valera Rozuvan
638da490ad Remove a method call which depends on IPython. 
Because IPython is not part of edx-platform dependencies, the
method assert_in has to be defined.
 2014-04-02 16:36:24 +00:00
Calen Pennington
7e23e2655a Rename metrics so that we capture checks as well as scores and number of attempts 2014-04-02 11:54:30 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20 
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
 2014-04-02 11:12:26 -04:00