Commits · 0039536fe20d8e77118a6b68e520f966fbf1a021 · edx / edx-platform · GitLab

02 Jun, 2014 31 commits
- Merge pull request #3872 from edx/nick/disable-masking · 0039536f
```
Temporarily disable masking
```
  Nick Parlante committed Jun 02, 2014
  0039536f Browse Files
- Merge pull request #3952 from edx/clytwynec/prereqs_installation_update · c22d0865
```
fix for prereqs installation cache check
```
  clytwynec committed Jun 02, 2014
  c22d0865 Browse Files
- Merge branch 'release' · 0d37b4b2
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
```
  Greg Price committed Jun 02, 2014
  0d37b4b2 Browse Files
- Merge pull request #3957 from edx/benmcmorran/authors · dbf4425e
```
Adds Ben McMorran to authors file.
```
  benmcmorran committed Jun 02, 2014
  dbf4425e Browse Files
- Adds Ben McMorran to authors file. · 1a0f57ac
  Ben McMorran committed Jun 02, 2014
  
  1a0f57ac Browse Files
- Merge pull request #3948 from edx/ammar/check-youtube-for-bok-choy · 4f55c827
```
Check YouTube for Bok-Choy
```
  muhammad-ammar committed Jun 02, 2014
  4f55c827 Browse Files
- Merge pull request #3949 from edx/ammar/improve-lettuce-youtube-availability-check · ba673f8f
```
Lettuce YouTube Check Improvements
```
  muhammad-ammar committed Jun 02, 2014
  ba673f8f Browse Files
- Merge pull request #3955 from edx/will/ora2-release-2014-06-02T15.45 · ba0bad1d
```
ORA2 release-2014-06-02T15.45
```
  Will Daly committed Jun 02, 2014
  ba0bad1d Browse Files
- Merge pull request #3951 from edx/anton/fix-relative-time · 007fde03
```
RelativeTime: incorrect value after XML serialization.
```
  Anton Stupak committed Jun 02, 2014
  007fde03 Browse Files
- Check YouTube for Bok-Choy · 55f0d0f9
  Muhammad Ammar committed Jun 02, 2014
  
  55f0d0f9 Browse Files
- Lettuce YouTube Check Improvements · 84ac5628
  Muhammad Ammar committed Jun 02, 2014
  
  84ac5628 Browse Files
- Merge pull request #3682 from edx/ammar/bok-choy-video-tests-batch9 · fd18165b
```
Bok-Choy Video Tests Batch9
```
  muhammad-ammar committed Jun 02, 2014
  fd18165b Browse Files
- Merge pull request #3704 from louyihua/localization-fix · f17e0bc1
```
i18n: Make .underscore files translatable
```
  David Baumgold committed Jun 02, 2014
  f17e0bc1 Browse Files
- adding prereq installation to js test tasks prereqs · f073afbf
  Christine Lytwynec committed Jun 02, 2014
  
  f073afbf Browse Files
- ORA2 release-2014-06-02T15.45 · 1a90aa9f
  Will Daly committed Jun 02, 2014
  
  1a90aa9f Browse Files
- Merge pull request #3480 from lduarte1991/lduarte-harvardx2 · 31274a52
```
Annotation Tool Clean up and Plugins
```
  Sarina Canelake committed Jun 02, 2014
  31274a52 Browse Files
- Merge pull request #3938 from edx/sylvia/docs/BLD-1049 · f33eb60c
```
Sylvia/docs/bld 1049
```
  srpearce committed Jun 02, 2014
  f33eb60c Browse Files
- Fix typo · df83f7ab
  Sylvia Pearce committed Jun 02, 2014
  
  df83f7ab Browse Files
- fix for prereqs installation cache check · e0deca26
  Christine Lytwynec committed Jun 02, 2014
  
  e0deca26 Browse Files
- Diacritic Plugin for Annotator Tool: Pull-request Fixes · b83e27fc
```
Making sure extension comes after annotator css
```
  lduarte1991 committed Jun 02, 2014
  b83e27fc Browse Files
- Diacritic Plugin for Annotator Tool: Added studio input · 88d88139
  lduarte1991 committed Jun 02, 2014
  
  88d88139 Browse Files
- Diacritic Plugin for Annotator TooL: Added CSS and JS files · de5edcff
```
- UI Fixes for Diacritic Mark Plugin
```
  lduarte1991 committed Jun 02, 2014
  de5edcff Browse Files
- BLD-1060: Fix RelativeTime. · 865b6936
  polesye committed Jun 02, 2014
  
  865b6936 Browse Files
- Merge pull request #3946 from edx/anton/i18n-code-response · ee368da6
```
CodeResponse: fix i18n.
```
  Anton Stupak committed Jun 02, 2014
  ee368da6 Browse Files
- Merge pull request #3895 from edx/anton/i18n-choice-text-response · 1a9f98b2
```
BLD-724: ChoiceTextResponse i18n.
```
  Anton Stupak committed Jun 02, 2014
  1a9f98b2 Browse Files
- Bok-Choy Video Tests Batch9 · d9fe111c
  Muhammad Ammar committed Jun 02, 2014
  
  d9fe111c Browse Files
- Merge pull request #3755 from edx/waheed/lms2711-staff-debug-links-fixed-for-all-units · 141c1cd2
```
Fixed links for units loaded via ajax.
```
  Waheed Ahmed committed Jun 02, 2014
  141c1cd2 Browse Files
- Fixed links for units loaded via ajax. · cc36162d
```
LMS-2711
```
  Waheed Ahmed committed Jun 02, 2014
  cc36162d Browse Files
- Merge pull request #3852 from edx/waheed/lms2737-fix-staff-debug-info-links · e6a9047f
```
Fixed staff debug info endpoints for staff member.
```
  Waheed Ahmed committed Jun 02, 2014
  e6a9047f Browse Files
- Fixed staff debug info endpoints for staff member. · cb2af134
```
LMS-2737
```
  Waheed Ahmed committed Jun 02, 2014
  cb2af134 Browse Files
- BLD-724: ChoiceTextResponse i18n. · 73df5a93
  polesye committed Jun 02, 2014
  
  73df5a93 Browse Files
30 May, 2014 9 commits
- Merge pull request #3943 from edx/flowerhack/cleanup-opaque-keys · f683a4c5
```
Change Location, CourseLocator, etc to reference opaque-keys library
```
  Sarina Canelake committed May 30, 2014
  f683a4c5 Browse Files
- Change Location, CourseLocator, etc to reference opaque-keys library · 6ccb11f0
  Julia Hansbrough committed May 30, 2014
  
  6ccb11f0 Browse Files
- Add note strongly recommending .webm and .mp4 video format · 09efc679
  Sylvia Pearce committed May 30, 2014
  
  09efc679 Browse Files
- Merge pull request #3919 from edx/benpatterson/clean-up-rbenv · 049e9f0d
```
Ensure no old gems are left behind between test runs.
```
  Ben Patterson committed May 30, 2014
  049e9f0d Browse Files
- Merge pull request #3937 from edx/adam/remove-qualaroo-studio · e348ab9a
```
removes qualaroo from studio (STUD-1684)
```
  Adam committed May 30, 2014
  e348ab9a Browse Files
- Merge pull request #3932 from edx/dhm/bug_orphans · 77b8cbba
```
Delete orphans was trying to get non-existent 'draft' modulestore
```
  Don Mitchell committed May 30, 2014
  77b8cbba Browse Files
- Describe Python support for multi-line comments · c389746a
```
Added more details around Python's support for multi-line translator comments.
```
  Andy Armstrong committed May 30, 2014
  c389746a Browse Files
- Merge pull request #3501 from edx/dcs/matlab-api-key · ed9ab3ad
```
Allow courses to set Matlab API key globally, in advanced settings.
```
  Dave St.Germain committed May 30, 2014
  ed9ab3ad Browse Files
- Merge pull request #3930 from edx/markhoeber/documentation/doc-446 · 2fd2eda6
```
Studio Welcome, Sign Up, and Sign In pages Help and text fixes
```
  Mark Hoeber committed May 30, 2014
  2fd2eda6 Browse Files