- 19 Aug, 2013 1 commit
-
-
Anton Stupak committed
-
- 17 Aug, 2013 1 commit
-
-
Feature/cdodge/add a mixed modulestore
chrisndodge committed
-
- 16 Aug, 2013 38 commits
-
-
Chris Dodge committed
-
Chris Dodge committed
-
xblock fields persist w/o breaking by scope
Don Mitchell committed -
Correctly seek in captions with non-1.0 speeds.
Jay Zoldak committed -
Fix for video and captions sync. Test for this fix.
Valera Rozuvan committed -
fixed encoding declaration
James Tauber committed -
Enable the django_nose app by default
Carlos Andrés Rocha committed -
Conflicts: common/lib/xmodule/xmodule/video_module.py
Jay Zoldak committed -
Zoldak/hotfix 2013 08 16
Jay Zoldak committed -
Don Mitchell committed
-
xgettext seems to only like `utf-8` not `utf8` so string extraction was failing without this
James Tauber committed -
fixed typo in faculty member settings text
James Tauber committed -
Chris Dodge committed
-
This was confusing translators as didn't make sense in English
James Tauber committed -
Conflicts: lms/envs/dev.py
Adam Palay committed -
Fix initial loading bug on `<formulaequationinput />`
Peter Baratta committed -
Don Mitchell committed
-
Don Mitchell committed
-
And fix get_explicitly_set to use it and to get the json not native field values.
Don Mitchell committed -
It's a reasonable demo of in memory xblock creation, but doesn't fit the xblock pattern. Moving temporarily to keep the dag persistence test.
Don Mitchell committed -
Don Mitchell committed
-
and fix some comments ref'g old names
Don Mitchell committed -
Letting xblocks handle scope rather than separating fields into different attrs. Although, split still shunts content fields to a different collection than setting and children fields. The big difference is that content fields will always be a dict and not sometimes just a string and there's no special casing of 'data' attr. The other mind change is no more 'metadata' dict.
Don Mitchell committed -
in grading, if problem cannot be created, return score as none
Adam committed -
add a filter to get_courses to not surface any courses that haven't been mapped, unless the store provider has been labeled as 'default'
Chris Dodge committed -
Adam Palay committed
-
Chris Dodge committed
-
Because with speed changing the time also changes for Flash playback, a different way to calculate the current time is needed than for HTML5 playback. I have added conditions for Flash and HTML5 video, and put old method of calculating time for Flash. I have tested it on the YouTube video ZwkTiUPN0mg. Both HTML5 mode and Flash mode have proper video-captions syncing with this fix. NOTE: to view YouTube video in Flash mode you either have to use an old browser (ex. Firefox version 18) or hard code in source that state.currentPlayerMode = 'flash' (in function _setPlayerMode(), file 01_initialize.js).
Valera Rozuvan committed -
Peter Fogg committed
-
Video: disable speed controls for unsupported browsers.
polesye committed -
Anton Stupak committed
-
Chris Dodge committed
-
Fix grade range names not being editable.
Peter Fogg committed -
Chris Dodge committed
-
Chris Dodge committed
-
Chris Dodge committed
-
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
Chris Dodge committed -
Chris Dodge committed
-