Commits · 52437263e33509946293556dfdd3f6943be3c6fa · edx / edx-platform · GitLab

16 Apr, 2014 6 commits
- Doc - for shuffle, targeted feedback, and answer pools changes to Building Course guide · 52437263
  Mark Hoeber committed Apr 16, 2014
  
  52437263 Browse Files
- Merge pull request #3283 from edx/will/ora2-delete-student-state · 84f63cd7
```
Reset submission API scores in beta and legacy instructor dash
```
  Will Daly committed Apr 16, 2014
  84f63cd7 Browse Files
- Reset submission API scores in beta and legacy instructor dash · 0b40354c
  Will Daly committed Apr 16, 2014
  
  0b40354c Browse Files
- Merge pull request #3354 from edx/valera/l63b · 3896fb09
```
Fix for BLD-993
```
  Valera Rozuvan committed Apr 16, 2014
  3896fb09 Browse Files
- Fix for BLD-993 · 9e8941f3
```
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
```
  Valera Rozuvan committed Apr 16, 2014
  9e8941f3 Browse Files
- Merge pull request #3319 from edx/raees/update-running-acceptance-tests-bokchoy · cf759414
```
Update Running Acceptance Tests Bok_Choy
```
  raeeschachar committed Apr 16, 2014
  cf759414 Browse Files
15 Apr, 2014 18 commits
- Merge pull request #3365 from edx/ahodges/documentation/DOC282 · 860e2f1e
```
DOC-282, table width must be 80% for change log
```
  Alison Hodges committed Apr 15, 2014
  860e2f1e Browse Files
- DOC-282, table width must be 80% for change log · 0dca3cba
  Alison Hodges committed Apr 15, 2014
  
  0dca3cba Browse Files
- Merge pull request #3364 from edx/ahodges/documentation/changelogrecovery · 0591d113
```
Reorganized, resequenced, removed redundancies
```
  Alison Hodges committed Apr 15, 2014
  0591d113 Browse Files
- Reorganized, resequenced, removed redundancies · d47b8bde
  Alison Hodges committed Apr 15, 2014
  
  d47b8bde Browse Files
- Merge pull request #3257 from edx/markhoeber/documentation/doc-249 · 9e95aa33
```
04/09/2014 Release Notes
```
  Alison Hodges committed Apr 15, 2014
  9e95aa33 Browse Files
- Merge pull request #3351 from edx/ahodges/documentation/DOC253 · 34177141
```
Ahodges/documentation/doc253
```
  Alison Hodges committed Apr 15, 2014
  34177141 Browse Files
- DOC-253, adds View in Studio button to LMS · b60dd386
  Alison Hodges committed Apr 15, 2014
  
  b60dd386 Browse Files
- Release notes 4-15-14 · 1f67fea1
  Sylvia Pearce committed Apr 15, 2014
  
  1f67fea1 Browse Files
- Merge pull request #3022 from edx/markhoeber/documentation/STUD-1428 · 0e6e2925
```
First Draft - Documentation for HTML Editor Changes
```
  srpearce committed Apr 15, 2014
  0e6e2925 Browse Files
- Documentation for HTML editor upgrade · 55f7d28c
```
STUD-1428
```
  Mark Hoeber committed Apr 15, 2014
  55f7d28c Browse Files
- Merge pull request #3339 from edx/andya/fix-duplicate-buttons · bd709a77
```
Fix duplicate save and cancel buttons showing when editing xblocks
```
  Andy Armstrong committed Apr 15, 2014
  bd709a77 Browse Files
- Fix duplicate save and cancel buttons in Studio · a3b28096
```
STUD-1531

Also add support for refreshing the modal on custom save
```
  Andy Armstrong committed Apr 15, 2014
  a3b28096 Browse Files
- Merge pull request #3331 from edx/zoldak/serve-test-videos-locally · b95b595e
```
Serve video HTML5 sources locally for acceptance tests
```
  Jay Zoldak committed Apr 15, 2014
  b95b595e Browse Files
- Update testing documentation · 7ff5d618
  Jay Zoldak committed Apr 15, 2014
  
  7ff5d618 Browse Files
- Update Running Acceptance Tests Bok_Choy · c1f75fe1
  raeeschachar committed Apr 15, 2014
  
  c1f75fe1 Browse Files
- Serve video HTML5 sources locally for acceptance tests · 3fc19a35
  Jay Zoldak committed Apr 15, 2014
  
  3fc19a35 Browse Files
- Merge pull request #1499 from edx/nick/shuffle-question · f1eefc11
```
Shuffle feature for multiple choice questions
```
  Nick Parlante committed Apr 14, 2014
  f1eefc11 Browse Files
- Merge pull request #3302 from edx/renzo/analytics-improvements · f80d3b87
```
Add more granular pageview tracking, update Segment.io snippet
```
  Renzo Lucioni committed Apr 14, 2014
  f80d3b87 Browse Files
14 Apr, 2014 16 commits
- Multiple-choice features · ab7d3b52
```
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)
```
  Nick Parlante committed Apr 14, 2014
  ab7d3b52 Browse Files
- Remove page view events corresponding to Drupal pages · a57a6280
  Renzo Lucioni committed Apr 14, 2014
  
  a57a6280 Browse Files
- Add comments explaining analytics improvements · da511808
  Renzo Lucioni committed Apr 14, 2014
  
  da511808 Browse Files
- Add more granular pageview tracking, update Segment.io snippet · 74d03809
  Renzo Lucioni committed Apr 14, 2014
  
  74d03809 Browse Files
- Merge pull request #3243 from edx/dcs/pdfbook-logging · ca14fba0
```
Added analytics event logging to PDF book viewer
```
  Dave St.Germain committed Apr 14, 2014
  ca14fba0 Browse Files
- Added analytics event logging to PDF book viewer · 1cf26962
  Dave St.Germain committed Apr 14, 2014
  
  1cf26962 Browse Files
- Merge pull request #3342 from edx/sanchez/ora2-2014-04-14 · 36be4e54
```
Release Apr 14, 2014
```
  Stephen Sanchez committed Apr 14, 2014
  36be4e54 Browse Files
- updated pdf viewer · 0a19c96a
  Dave St.Germain committed Apr 14, 2014
  
  0a19c96a Browse Files
- Merge branch 'master' of github.com:edx/edx-platform · 0a839d9f
  Chris Dodge committed Apr 14, 2014
  
  0a839d9f Browse Files
- Merge branch 'release' · 27d7c19c
```
Conflicts:
	cms/templates/widgets/source-edit.html
```
  Chris Dodge committed Apr 14, 2014
  27d7c19c Browse Files
- Merge pull request #3340 from edx/anton/fix-unit-test · ff06bfb6
```
Fix unit test.
```
  Anton Stupak committed Apr 14, 2014
  ff06bfb6 Browse Files
- Release Apr 14, 2014 · d0635b85
  Stephen Sanchez committed Apr 14, 2014
  
  d0635b85 Browse Files
- Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting · 28bf6234
```
This makes the metrics tab "bars" clickable.
```
  David Adams committed Apr 14, 2014
  28bf6234 Browse Files
- Fix unit test. · 78996a9c
  polesye committed Apr 14, 2014
  
  78996a9c Browse Files
- Merge pull request #3337 from edx/sarina/041314-language-update · ada5cb4a
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Apr 14, 2014
  ada5cb4a Browse Files
- Merge pull request #3151 from edx/jmclaus/disable_hd_control_when_hd_qualities_not_available · db5eee87
```
Disable HD control when HD is not available [BLD-937]
```
  jmclaus committed Apr 14, 2014
  db5eee87 Browse Files