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

22549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
bd709a77ee Merge pull request #3339 from edx/andya/fix-duplicate-buttons 
Fix duplicate save and cancel buttons showing when editing xblocks
 2014-04-15 15:16:34 -04:00
Andy Armstrong
a3b2809601 Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 14:04:55 -04:00
Jay Zoldak
b95b595e6b Merge pull request #3331 from edx/zoldak/serve-test-videos-locally 
Serve video HTML5 sources locally for acceptance tests
 2014-04-15 11:30:04 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -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
Renzo Lucioni
f80d3b8755 Merge pull request #3302 from edx/renzo/analytics-improvements 
Add more granular pageview tracking, update Segment.io snippet
 2014-04-14 22:24:26 -04: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
Renzo Lucioni
a57a62807e Remove page view events corresponding to Drupal pages 2014-04-14 18:20:17 -04:00
Renzo Lucioni
da51180815 Add comments explaining analytics improvements 2014-04-14 18:20:17 -04:00
Renzo Lucioni
74d03809a7 Add more granular pageview tracking, update Segment.io snippet 2014-04-14 18:20:16 -04:00
Dave St.Germain
ca14fba08b Merge pull request #3243 from edx/dcs/pdfbook-logging 
Added analytics event logging to PDF book viewer
 2014-04-14 17:56:26 -04:00
Dave St.Germain
1cf2696289 Added analytics event logging to PDF book viewer 2014-04-14 17:55:53 -04:00
Stephen Sanchez
36be4e543c Merge pull request #3342 from edx/sanchez/ora2-2014-04-14 
Release Apr 14, 2014
 2014-04-14 14:48:34 -04: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
Anton Stupak
ff06bfb6c4 Merge pull request #3340 from edx/anton/fix-unit-test 
Fix unit test.
 2014-04-14 21:15:09 +03:00
Stephen Sanchez
d0635b852d Release Apr 14, 2014 2014-04-14 13:17:55 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting 
This makes the metrics tab "bars" clickable.
 2014-04-14 09:42:33 -07:00
polesye
78996a9c1f Fix unit test. 2014-04-14 19:14:47 +03:00
Sarina Canelake
ada5cb4a48 Merge pull request #3337 from edx/sarina/041314-language-update 
Update translations (autogenerated message)
 2014-04-14 11:37:59 -04:00
jmclaus
db5eee878a Merge pull request #3151 from edx/jmclaus/disable_hd_control_when_hd_qualities_not_available 
Disable HD control when HD is not available [BLD-937]
 2014-04-14 11:12:00 -04:00
chrisndodge
b55306e0d0 Merge pull request #3334 from edx/rc/2014-04-14 
Rc/2014 04 14
 2014-04-14 10:57:58 -04:00
Sarina Canelake
a93d556580 Update translations (autogenerated message) 2014-04-14 10:41:39 -04: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
Valera Rozuvan
2eb997cd7a Merge pull request #3272 from edx/valera/fiji 
Introducing JSHint.
 2014-04-14 16:37:08 +03: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
19fe545740 Merge pull request #3318 from edx/valera/l62a 
Update acceptance tests to use real duration of YouTube video.
 2014-04-14 11:31:37 +03:00
Valera Rozuvan
92024a5b66 Introducing JSHint. 2014-04-14 10:43:54 +03:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Sarina Canelake
16a408837d Merge pull request #3300 from edx/sarina/lms-2217 
Fix course urls in enrollment emails (LMS-2217)
 2014-04-12 10:03:51 -04:00
Sarina Canelake
9a586edf02 InstDash: check Auto-Enroll and Email Students boxes by default 2014-04-11 18:43:43 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
Chris Rossi
7cb052e5fc Upgrade JSDraw. 2014-04-11 17:04:11 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable. 
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
 2014-04-11 13:56:49 -07:00
Alison Hodges
4a7bd21c82 Merge pull request #3309 from edx/ahodges/documentation/DOC252 
DOC-252, add section on interpreting answer distribution
 2014-04-11 16:50:35 -04:00
Alison Hodges
decf2c0505 DOC-252, add section on interpreting answer distribution 2014-04-11 16:50:07 -04:00
Adam
69f11c7d53 Merge pull request #3322 from edx/release 
Release
 2014-04-11 14:40:44 -04:00
frances botsford
add0352b24 Merge pull request #3324 from edx/frances/fix/studio-pages-prompt 
Fix for fuzzy prompt on Studio Pages
 2014-04-11 14:01:19 -04:00
Frances Botsford
0309b3ad10 fix for fuzzy prompt on Studio Pages 2014-04-11 13:06:22 -04:00
Adam
b5d1019af3 Merge pull request #3308 from edx/adam/hotfix-js-draw 
Upgrade JSDraw.
 2014-04-11 12:55:12 -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
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
Nimisha Asthagiri
fe4bd4cbad Merge pull request #3234 from edx/nimisha/container-duplicate-delete 
Nimisha/container duplicate delete
 2014-04-10 22:10:33 -04:00
Frances Botsford
48d935d715 fix for fuzzy prompt on container page 2014-04-10 21:22:20 -04:00
Nimisha Asthagiri
dd3c8c268c Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag). 2014-04-10 21:22:15 -04:00
Jim Abramson
81597a5c6a Merge pull request #3295 from edx/jsa/disc-preview 
in Studio, render compact placeholders for inline discussions.
 2014-04-10 16:50:58 -04: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
Jay Zoldak
76297c3050 Merge pull request #3305 from edx/zoldak/no-lettuce-with-discussion 
Disable discussion service setting for lettuce tests
 2014-04-10 13:56:09 -04:00