Commits · 375c206a2bbd455a2527b90f078cb48d0868739d · edx / edx-platform

31 Mar, 2014 1 commit
- Fixed lagacy dash numeric placeholders with named. · 375c206a
  Waheed Ahmed committed Mar 31, 2014
  
  375c206a 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 2 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
28 Mar, 2014 35 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
- this will allow for clientside javascript reporting · e87e9316
  John Jarvis committed Mar 28, 2014
  
  e87e9316 Browse Files
- Merge pull request #3089 from mulby/gabe/publish · 05d959bc
```
Support emitting analytical events from xblocks running in the LMS
```
  Gabe Mulley committed Mar 28, 2014
  05d959bc Browse Files
- Merge pull request #3105 from edx/adam/hotifx-js · 94966a0e
```
temporarily remove SR on capa alerts to fix problem submissions (LMS-247...
```
  Adam committed Mar 28, 2014
  94966a0e Browse Files
- Merge pull request #2613 from edx/bugfix/ichuang/idash-raw-grades-dump · ffd47c45
```
fix raw grade dump in standard instructor dashboard
```
  Calen Pennington committed Mar 28, 2014
  ffd47c45 Browse Files
- Add more tags to comment_client request metrics · 6dd6f0c7
```
This captures real-time metrics for all of the comment client actions,
segregated by course_id, as well as other small-cardinality fields.

The goal is to be able to detect changes in forum usage, with the goal
of alerting on potential error conditions.
```
  Calen Pennington committed Mar 28, 2014
  6dd6f0c7 Browse Files
- Use requests library utility method for getting json results · ec1b056d
  Calen Pennington committed Mar 28, 2014
  
  ec1b056d Browse Files
- Remove unused *args and **kwargs from perform_request · cb93b665
  Calen Pennington committed Mar 28, 2014
  
  cb93b665 Browse Files
- Remove unused methods from comment_client · d4db0ee7
  Calen Pennington committed Mar 28, 2014
  
  d4db0ee7 Browse Files
- fix raw grade dump in standard instructor dashboard · 9e58ef69
```
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
```
  Carson Gee committed Mar 28, 2014
  9e58ef69 Browse Files
- Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes · e1afbe50
```
Unicode support fixes
```
  Usman Khalid committed Mar 28, 2014
  e1afbe50 Browse Files
- temporarily remove SR on capa alerts to fix problem submissions (LMS-2474) · 8e01f178
  Adam Palay committed Mar 28, 2014
  
  8e01f178 Browse Files
- Merge pull request #3097 from edx/dcs/paver-reqs · 3e9d1b39
```
Reduce false cache misses when evaluating prerequisites
```
  Dave St.Germain committed Mar 28, 2014
  3e9d1b39 Browse Files
- Merge pull request #3064 from edx/nimisha/studio-reorder-and-hide-tabs · 2561c010
```
Nimisha/studio reorder and hide tabs
```
  Nimisha Asthagiri committed Mar 28, 2014
  2561c010 Browse Files
- Support for "View Live" on Pages page. · 1bd6792a
```
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
```
  Nimisha Asthagiri committed Mar 28, 2014
  1bd6792a Browse Files
- Studio - revising markup, templates and styling for page editing UI: · 3b0f7148
```
* added in fixed state markup/logic
* added in collection markup/logic
* revised styling for page titles, collection, and fixed elements
```
  Brian Talbot committed Mar 28, 2014
  3b0f7148 Browse Files
- Add the ability to reorder Pages and hide the Wiki page. · d865e909
  Nimisha Asthagiri committed Mar 28, 2014
  
  d865e909 Browse Files
- Merge pull request #3085 from edx/valera/make_youtube_mocked_server_serve_youtube_api · 6bcae9aa
```
Make YouTube mocked server serve YouTube API
```
  Valera Rozuvan committed Mar 28, 2014
  6bcae9aa Browse Files
- Make YouTube mocked server serve YouTube API · 3f41aae9
```
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
```
  Valera Rozuvan committed Mar 28, 2014
  3f41aae9 Browse Files
- Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc · b35994f1
```
Update doc string for YouTube stub server.
```
  Valera Rozuvan committed Mar 28, 2014
  b35994f1 Browse Files