Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cahrens
2014-08-12 13:51:58 -04:00
parent e727bd2202 ad37d93d24
commit ee836d4c40
8 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/lib/xmodule/xmodule/modulestore/inheritance.py
View File

@@ -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
)

5
common/static/js/vendor/ova/flagging-annotator.js vendored
View File

@@ -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;