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

8006 Commits

Author SHA1 Message Date
Andy Armstrong
1b2d1858fa Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 15:28:22 -04: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
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04: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
Waqas Khalid
70b525e259 Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name 
fix change name view by replacing the request.user simple lazy object wi...
 2014-04-14 17:55:26 +05:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03: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
Waqas Khalid
43377af85a fix change name view by replacing the request.user simple lazy object with request.user.id 
LMS-2479
 2014-04-11 18:36:49 +05:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
Greg Price
f233fcff4b Merge pull request #3307 from edx/gprice/deleted-thread-404 
Return 404 instead of 500 for missing forum thread
 2014-04-10 15:27:21 -04:00
Greg Price
ecf9923e96 Return 404 instead of 500 for missing forum thread 
Also show a more specific error message in the front end. This change
only has an effect if using cs_comments_service commit 1d71330 or later.
 2014-04-10 13:17:58 -04:00
muhammad-ammar
2318ce18c4 Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy 
Convert lettuce video tests to bok choy
 2014-04-10 21:38:00 +05: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
Muhammad Ammar
5b6f3f8fbf Convert first batch of lettuce video tests to bok-choy. 2014-04-10 15:18:03 +00: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
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination 
Add repsonse pagination to inline discussions
 2014-04-09 17:55:15 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -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
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04: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
Frances Botsford
e18dd7f50a fixed mixin sass 2014-04-09 10:32:12 -04:00
Frances Botsford
636fa19033 small ui fixes in Studio - textbooks upload and loading font-size 2014-04-09 10:32:11 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
Valera Rozuvan
fc84fd75cf Merge pull request #3273 from edx/valera/hendrixx 
Tweaking automatic screenshots in acceptance tests.
 2014-04-09 14:34:00 +03: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
Valera Rozuvan
b2543bfa95 Tweaking automatic screenshots in acceptance tests. 2014-04-09 11:37:32 +03:00
Oleg Marshev
c515b9cb38 Remove params from list. 2014-04-09 11:35:59 +03:00
Sarina Canelake
2d08b3a394 Fix i18n'd strings to be easier for translators to understand 
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
 2014-04-08 13:09:07 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer" 
This reverts commit b0a7443570.
 2014-04-08 12:59:04 -04: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
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +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
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542 
Change behavior of cohort addition interface
 2014-04-07 12:54:38 -04:00