Commits · db5eee878afffd4eebd5d8a6ead28263cd38e4d1 · edx / edx-platform · GitLab

14 Apr, 2014 7 commits
- 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
- HD control is hidden initially. On first play of video, when · f05c0aa8
```
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
```
  jmclaus committed Apr 14, 2014
  f05c0aa8 Browse Files
- Merge pull request #3272 from edx/valera/fiji · 2eb997cd
```
Introducing JSHint.
```
  Valera Rozuvan committed Apr 14, 2014
  2eb997cd Browse Files
- Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name · 70b525e2
```
fix change name view by replacing the request.user simple lazy object wi...
```
  Waqas Khalid committed Apr 14, 2014
  70b525e2 Browse Files
- Merge pull request #3318 from edx/valera/l62a · 19fe5457
```
Update acceptance tests to use real duration of YouTube video.
```
  Valera Rozuvan committed Apr 14, 2014
  19fe5457 Browse Files
- Introducing JSHint. · 92024a5b
  Valera Rozuvan committed Apr 14, 2014
  
  92024a5b Browse Files
- Update acceptance tests to use real duration of YouTube video. · 615ce239
  Valera Rozuvan committed Apr 14, 2014
  
  615ce239 Browse Files
12 Apr, 2014 1 commit
- Merge pull request #3300 from edx/sarina/lms-2217 · 16a40883
```
Fix course urls in enrollment emails (LMS-2217)
```
  Sarina Canelake committed Apr 12, 2014
  16a40883 Browse Files
11 Apr, 2014 13 commits
- InstDash: check Auto-Enroll and Email Students boxes by default · 9a586edf
  Sarina Canelake committed Apr 11, 2014
  
  9a586edf Browse Files
- Fix course urls in enrollment emails (LMS-2217) · 338a242e
  Sarina Canelake committed Apr 11, 2014
  
  338a242e Browse Files
- Merge pull request #3309 from edx/ahodges/documentation/DOC252 · 4a7bd21c
```
DOC-252, add section on interpreting answer distribution
```
  Alison Hodges committed Apr 11, 2014
  4a7bd21c Browse Files
- DOC-252, add section on interpreting answer distribution · decf2c05
  Alison Hodges committed Apr 11, 2014
  
  decf2c05 Browse Files
- Merge pull request #3322 from edx/release · 69f11c7d
```
Release
```
  Adam committed Apr 11, 2014
  69f11c7d Browse Files
- Merge pull request #3324 from edx/frances/fix/studio-pages-prompt · add0352b
```
Fix for fuzzy prompt on Studio Pages
```
  frances botsford committed Apr 11, 2014
  add0352b Browse Files
- fix for fuzzy prompt on Studio Pages · 0309b3ad
  Frances Botsford committed Apr 11, 2014
  
  0309b3ad Browse Files
- Merge pull request #3308 from edx/adam/hotfix-js-draw · b5d1019a
```
Upgrade JSDraw.
```
  Adam committed Apr 11, 2014
  b5d1019a Browse Files
- Merge pull request #3231 from edx/anton/refactor-speed-control · 24b631f7
```
Video: Refactor speed control.
```
  Anton Stupak committed Apr 11, 2014
  24b631f7 Browse Files
- fix change name view by replacing the request.user simple lazy object with request.user.id · 43377af8
```
LMS-2479
```
  Waqas Khalid committed Apr 11, 2014
  43377af8 Browse Files
- Merge pull request #3234 from edx/nimisha/container-duplicate-delete · fe4bd4cb
```
Nimisha/container duplicate delete
```
  Nimisha Asthagiri committed Apr 10, 2014
  fe4bd4cb Browse Files
- fix for fuzzy prompt on container page · 48d935d7
  Frances Botsford committed Apr 10, 2014
  
  48d935d7 Browse Files
- Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag). · dd3c8c26
  Nimisha Asthagiri committed Apr 10, 2014
  
  dd3c8c26 Browse Files
10 Apr, 2014 13 commits
- Merge pull request #3295 from edx/jsa/disc-preview · 81597a5c
```
in Studio, render compact placeholders for inline discussions.
```
  Jim Abramson committed Apr 10, 2014
  81597a5c Browse Files
- in Studio, render compact placeholders for inline discussions. · 72c3c87c
```
JIRA: FOR-429
```
  jsa committed Apr 10, 2014
  72c3c87c Browse Files
- Merge pull request #3307 from edx/gprice/deleted-thread-404 · f233fcff
```
Return 404 instead of 500 for missing forum thread
```
  Greg Price committed Apr 10, 2014
  f233fcff Browse Files
- Merge pull request #3305 from edx/zoldak/no-lettuce-with-discussion · 76297c30
```
Disable discussion service setting for lettuce tests
```
  Jay Zoldak committed Apr 10, 2014
  76297c30 Browse Files
- Return 404 instead of 500 for missing forum thread · ecf9923e
```
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.
```
  Greg Price committed Apr 10, 2014
  ecf9923e Browse Files
- Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy · 2318ce18
```
Convert lettuce video tests to bok choy
```
  muhammad-ammar committed Apr 10, 2014
  2318ce18 Browse Files
- Upgrade JSDraw. · f04cd649
  Chris Rossi committed Apr 10, 2014
  
  f04cd649 Browse Files
- Disable discussion service setting for lettuce tests · 9957b1aa
  Jay Zoldak committed Apr 10, 2014
  
  9957b1aa Browse Files
- Merge pull request #2440 from glowe/prevent-duplicate-checks · 15a49f87
```
Temporarily disable CAPA problem "Check" button.
```
  David Baumgold committed Apr 10, 2014
  15a49f87 Browse Files
- Convert first batch of lettuce video tests to bok-choy. · 5b6f3f8f
  Muhammad Ammar committed Apr 10, 2014
  
  5b6f3f8f Browse Files
- Merge pull request #3297 from edx/merge-release-into-master · 3fd89a0d
```
Merge release into master
```
  Adam committed Apr 10, 2014
  3fd89a0d Browse Files
- Merge pull request #3289 from edx/zoldak/quiet-acceptance-test-logs · 2c500a2b
```
Quiet some noisy loggers for lettuce acceptance tests
```
  Jay Zoldak committed Apr 10, 2014
  2c500a2b Browse Files
- Merge pull request #2981 from edx/andya/container-editing · 8059547e
```
Add "Edit" button to each leaf xblock on the container page
```
  Andy Armstrong committed Apr 10, 2014
  8059547e Browse Files
09 Apr, 2014 6 commits
- Merge pull request #3183 from edx/gprice/inline-response-pagination · 8c8367b0
```
Add repsonse pagination to inline discussions
```
  Greg Price committed Apr 09, 2014
  8c8367b0 Browse Files
- Merge pull request #3298 from edx/markhoeber/documentation/doc-79 · 8609345b
```
Fixed typo in drag & drop
```
  Mark Hoeber committed Apr 09, 2014
  8609345b Browse Files
- Fixed typo in drag & drop · 581702e1
```
numbers -> number
```
  Mark Hoeber committed Apr 09, 2014
  581702e1 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · b34c46dd
  Adam Palay committed Apr 09, 2014
  
  b34c46dd Browse Files
- Add bok-choy tests for inline response pagination · 16847d85
  Greg Price committed Apr 09, 2014
  
  16847d85 Browse Files
- addressing review feedback · df0973e7
  Frances Botsford committed Apr 09, 2014
  
  df0973e7 Browse Files