Merge branch 'release' from 2014-08-12 release.

CHANGELOG.rst

@@ -5,6 +5,8 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Blades: Course teams can turn off Chinese Caching from Studio. BLD-1207
+
 LMS: Instructors can request and see content of previous bulk emails sent in the instructor dashboard.
 
 Studio: New course outline and unit/container pages with revised publishing model. STUD-1790 (part 1)

cms/djangoapps/models/settings/course_metadata.py

@@ -24,10 +24,8 @@ class CourseMetadata(object):
                      'graded',
                      'hide_from_toc',
                      'pdf_textbooks',
-                     'user_partitions',
                      'name',  # from xblock
                      'tags',  # from xblock
-                     'video_speed_optimizations',
                      'visible_to_staff_only'
     ]
 

common/lib/xmodule/xmodule/modulestore/inheritance.py

@@ -148,7 +148,8 @@ class InheritanceMixin(XBlockMixin):
         scope=Scope.settings
     )
     video_speed_optimizations = Boolean(
-        help="Enable Video CDN.",
+        display_name=_("Enable video caching system"),
+        help=_("Enter true or false. If true, video caching will be used for HTML5 videos."),
         default=True,
         scope=Scope.settings
     )

common/static/js/vendor/ova/flagging-annotator.js

@@ -76,8 +76,9 @@ Annotator.Plugin.Flagging = (function(_super) {
      */
     Flagging.prototype.updateField = function(field, annotation) {
         
-        // figure out whether annotation is of image or not
-        var user_email = annotation.media === "image" ? 
+        // figure out whether annotation is of type image or if ova is not defined (meaning it
+        // it doesn't have a type yet, but it is still an image).
+        var user_email = (annotation.media === "image" || typeof ova === 'undefined') ? 
                             osda.options.optionsAnnotator.permissions.user.id:
                             ova.options.optionsAnnotator.permissions.user.id;
         

lms/envs/common.py

@@ -148,7 +148,10 @@ FEATURES = {
     # Staff Debug tool.
     'ENABLE_STUDENT_HISTORY_VIEW': True,
 
-    # segment.io for LMS--need to explicitly turn it on for production.
+    # Optimizely for the LMS--need to explicitly turn on for production.
+    'OPTIMIZELY_LMS': False,
+
+    # Segment.io for LMS--need to explicitly turn on for production.
     'SEGMENT_IO_LMS': False,
 
     # Provide a UI to allow users to submit feedback from the LMS (left-hand help modal)

lms/templates/main.html

@@ -90,6 +90,8 @@
     <script src="${static.url('js/html5shiv.js')}"></script>
   <![endif]-->
 
+  <%include file="widgets/optimizely.html" />
+
   <meta name="path_prefix" content="${EDX_ROOT_URL}">
   <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
 

lms/templates/mktg_iframe.html

@@ -22,6 +22,8 @@
 
   <%block name="headextra"/>
 
+  <%include file="widgets/optimizely.html" />
+
   <!-- NOTE: if we want segment io on these iframes at some point, put
     include file="widgets/segment-io.html"
   here -->

lms/templates/widgets/optimizely.html

@@ -0,0 +1,3 @@
+% if settings.FEATURES.get('OPTIMIZELY_LMS'):
+<script src="//cdn.optimizely.com/js/1706490390.js"></script>
+% endif