- 16 Aug, 2013 3 commits
-
-
Conflicts: lms/envs/dev.py
Adam Palay 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
-
- 15 Aug, 2013 9 commits
-
-
Chris Dodge committed
-
Don Mitchell committed
-
Carlos Andrés Rocha committed
-
Also fixes problems with double-quoted strings (historical artifact). STUD-640 Conflicts: common/lib/xmodule/xmodule/video_module.py
cahrens committed -
update tests to call definition_to_xml rather than export_to_xml, which presumes writing to a filesystem, plus it adds a url_name to the attribute set. Also, on __init__ reset the 'category' attribute, on some code paths this can get lost. Not sure why, but this gets all the tests to pass.
Chris Dodge committed -
Chris Dodge committed
-
export_to_xml() really should be definition_to_xml() since we'll rely on the base method that is in xml_module.py to preserve the correct export filesystem hierarchy.
Chris Dodge committed -
Chris Dodge committed
-
Fix error seen in combinedopenended modules
Jay Zoldak committed
-
- 14 Aug, 2013 7 commits
-
-
Adam Palay committed
-
Sarina Canelake committed
-
Hotfix/adam/help modal
Jay Zoldak committed -
Adam Palay committed
-
Adam Palay committed
-
Adam Palay committed
-
Adam Palay committed
-
- 13 Aug, 2013 5 commits
-
-
Adam Palay committed
-
Adam Palay committed
-
Adam Palay committed
-
Adam Palay committed
-
Adam Palay committed
-
- 12 Aug, 2013 16 commits
-
-
instructor dash fixes
Adam committed -
Coffee compile command now executes for just *.coffee items.
Will Daly committed -
Add new setting to cms project
chrisndodge committed -
Chris Dodge committed
-
Migration videoalpha module to one main video module
Lyla Fischer committed -
Change console logging stream from stdout to stderr
Carlos Andrés Rocha committed -
Chris Dodge committed
-
Enable beta dashboard, add copy, add i18n
Miles Steele committed -
Chris Dodge committed
-
Miles Steele committed
-
Calc module changes: previewing and <formulaequationinput> To see individual commits, see tag peterb/formula-preview/presquash
Peter Baratta committed -
Peter Baratta committed
-
Named `FormulaEquationInput` (name up for debate) - Based off ChemEqnIn - Add FormulaEquationInput in inputtypes.py - Add a call to a skeleton method for a preview javascript: - Queue up some MathJax - Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview - Tests Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
Peter Baratta committed -
- Create a method called `parse_algebra`. It takes a string of math and returns with a `pyparsing.ParseResults` object representing it. - `evaluator` takes this tree and applies the old "parse actions" to it to get the same number as it used to. - Change calc's API: `evaluator` to use `case_sensitive` rather than `cs` - Add most of the capability for latex rendering
Peter Baratta committed -
Adam Palay committed
-
Miles Steele committed
-