Commits · cbfe12fc9c282242a7419c18e18c56671ef45972 · edx / edx-platform

31 Mar, 2014 19 commits
- Merge pull request #3088 from fmyzjs/patch-3 · cbfe12fc
```
Update course_about.html
```
  David Baumgold committed Mar 31, 2014
  cbfe12fc Browse Files
- Revert "Transcript translations should be displayed in their source language." · 64e28676
```
This reverts commit b4ba04ba.
```
  Alexander Kryklia committed Mar 31, 2014
  64e28676 Browse Files
- Revert "Fix tests." · 2ec08921
```
This reverts commit 1ed167d9.
```
  Alexander Kryklia committed Mar 31, 2014
  2ec08921 Browse Files
- Fix tests. · 1ed167d9
  Alexander Kryklia committed Mar 31, 2014
  
  1ed167d9 Browse Files
- Transcript translations should be displayed in their source language. · b4ba04ba
  Alexander Kryklia committed Mar 31, 2014
  
  b4ba04ba Browse Files
- Merge pull request #2899 from edx/alex/multiple_transcripts_editor · b3f479c8
```
Alex/multiple transcripts editor
```
  Alexander Kryklia committed Mar 31, 2014
  b3f479c8 Browse Files
- Add multiple transcripts editor. · dfa7c27e
```
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
```
  Alexander Kryklia committed Mar 31, 2014
  dfa7c27e Browse Files
- Merge pull request #2830 from edx/ahodges/documentation/answerdist · 90064234
```
Ahodges/documentation/answerdist
```
  Mark Hoeber committed Mar 31, 2014
  90064234 Browse Files
- Documentation for answer distributions · f81908e5
  Alison Hodges committed Mar 31, 2014
  
  f81908e5 Browse Files
- Merge pull request #3115 from edx/sarina/update-i18n-translators-docs · 78c8bcaa
```
Update Translation documentation
```
  Sarina Canelake committed Mar 31, 2014
  78c8bcaa Browse Files
- Merge pull request #3102 from edx/valera/add_acceptance_test_youtube_html5_blocked_api · e6d2f323
```
Add acceptance test for blocked YouTueb API with HTML5 sources
```
  Valera Rozuvan committed Mar 31, 2014
  e6d2f323 Browse Files
- Merge pull request #3010 from edx/zub/bugfix/std1455-studioaccessissue · 9b3edaa0
```
raise ItemNotFoundError if course not found in modulestore (course_listing) 
```
  zubair-arbi committed Mar 31, 2014
  9b3edaa0 Browse Files
- Addressing comments. · 34ac6190
  Valera Rozuvan committed Mar 31, 2014
  
  34ac6190 Browse Files
- Add acceptance test for blocked YouTueb API with HTML5 sources · 4610bd1b
```
When the video has both YouTube IDs and HTML5 sources, and
the YouTube API is blocked, then HTML5 sources should be
used.
```
  Valera Rozuvan committed Mar 31, 2014
  4610bd1b Browse Files
- Merge pull request #3086 from edx/waheed/fix-lagacy-dash-numeric-placeholders · f748173b
```
Fixed legacy dash numeric placeholders with named.
```
  Waheed Ahmed committed Mar 31, 2014
  f748173b Browse Files
- raise ItemNotFoundError if course not found in modulestore (course_listing) · 2b389a2d
```
STUD-1455
```
  zubiar-arbi committed Mar 31, 2014
  2b389a2d Browse Files
- Fixed lagacy dash numeric placeholders with named. · 375c206a
  Waheed Ahmed committed Mar 31, 2014
  
  375c206a Browse Files
- Merge pull request #2940 from edx/waheed/lms2169-open-ended-panel-headings-not-internationalized · c3b8380d
```
Internationalized open ended panel headings.
```
  Waheed Ahmed committed Mar 31, 2014
  c3b8380d Browse Files
- Open ended panel headings not internationalized. · eb9133ae
```
LMS-2169
```
  Waheed Ahmed committed Mar 31, 2014
  eb9133ae Browse Files
30 Mar, 2014 2 commits
- Merge branch 'release' · 7d618f26
```
Conflicts:
	lms/djangoapps/courseware/features/video.feature
```
  Carlos Andrés Rocha committed Mar 29, 2014
  7d618f26 Browse Files
- Merge pull request #3124 from edx/valera/fix_multiple_videos_on_page_RELEASE · 487b7782
```
Valera/fix multiple videos on page release
```
  Carlos Andrés Rocha committed Mar 29, 2014
  487b7782 Browse Files
29 Mar, 2014 3 commits
- Adding acceptance test for multiple videos. · a4f6a67f
```
Part of BLD-972.
```
  Valera Rozuvan committed Mar 30, 2014
  a4f6a67f Browse Files
- Fix multiple videos on page · a883d253
```
If there are several videos on page, make sure that
the global onYouTubeIframeAPIReady function is properly
setup so that all callbacks are trigerred when the YouTube API
loads.

BLD-972
```
  Valera Rozuvan committed Mar 29, 2014
  a883d253 Browse Files
- Update Translation documentation · 7b13cd32
  Sarina Canelake committed Mar 28, 2014
  
  7b13cd32 Browse Files
28 Mar, 2014 16 commits
- Merge pull request #3062 from cpennington/comment-client-metrics · bb2508ac
```
Add metrics to comment_client requests
```
  Calen Pennington committed Mar 28, 2014
  bb2508ac Browse Files
- Merge pull request #3061 from cpennington/model-metrics · f4e55ccb
```
Add datadog metrics logging for django model creates, updates, and deletes
```
  Calen Pennington committed Mar 28, 2014
  f4e55ccb Browse Files
- Merge pull request #3114 from edx/zoldak/skip-failing-video-test · b5fb8cb0
```
Disable failing video test
```
  Jay Zoldak committed Mar 28, 2014
  b5fb8cb0 Browse Files
- Disable failing video test · 748fc120
  Jay Zoldak committed Mar 28, 2014
  
  748fc120 Browse Files
- Merge pull request #3006 from edx/markhoeber/documentation/DOC-105 · 6dfcb8e2
```
Markhoeber/documentation/doc 105
```
  Mark Hoeber committed Mar 28, 2014
  6dfcb8e2 Browse Files
- Custom JavaScript Display and Grading · 7ac22708
```
DOC-105
```
  Mark Hoeber committed Mar 28, 2014
  7ac22708 Browse Files
- Merge pull request #3113 from edx/adam/merge-release-2 · a343d336
```
Adam/merge release 2
```
  Adam committed Mar 28, 2014
  a343d336 Browse Files
- Merge pull request #3112 from edx/zoldak/skip-failing-tests · ce787d27
```
Temporarily disable the bok-choy test that is intermittently failing
```
  Jay Zoldak committed Mar 28, 2014
  ce787d27 Browse Files
- Merge pull request #3038 from edx/ahodges/documentation/dataczar · cef471d4
```
AN-167 New chapter on role & skills of data czar and research team
```
  Mark Hoeber committed Mar 28, 2014
  cef471d4 Browse Files
- AN-167 New chapter on role & skills of data czar and research team · 8d827332
  Alison Hodges committed Mar 28, 2014
  
  8d827332 Browse Files
- Merge remote-tracking branch 'origin/release' into adam/merge-release-2 · c6743376
  Adam Palay committed Mar 28, 2014
  
  c6743376 Browse Files
- Temporarily disable the bok-choy test that is intermittenly failing · 65bae9a6
  Jay Zoldak committed Mar 28, 2014
  
  65bae9a6 Browse Files
- Merge pull request #3111 from edx/zoldak/skip-failing-tests · 5471bab8
```
Skip video test that is failing in master
```
  Jay Zoldak committed Mar 28, 2014
  5471bab8 Browse Files
- Skip video test that is failing in master · 1532badf
  Jay Zoldak committed Mar 28, 2014
  
  1532badf Browse Files
- Add datadog metrics logging for django model creates, updates, and deletes · 81a038cb
  Calen Pennington committed Mar 28, 2014
  
  81a038cb Browse Files
- Merge pull request #3109 from edx/jarv/upgrade-newrelic-agent · 89293731
```
this will allow for clientside javascript reporting
```
  John Jarvis committed Mar 28, 2014
  89293731 Browse Files