Commits on Jan 25, 2016
  1. @jobara

    Merge remote-tracking branch 'anastasia/VP-335'

    * anastasia/VP-335:
      VP-335: Simplify "showCurrentTrack()" by using fluid.byId()
      VP-335: Linting and small fixes
      VP-335: Update tests to latest Amara api
      VP-335: Clean up changes to work with model relay code
      VP-355: Fix track selection to use id instead of array index
      VP-335: Update Amara API; captions still not displaying, but they are being retrieved
    jobara committed Jan 25, 2016
  2. @acheetham
  3. @acheetham
  4. @acheetham
  5. @jobara

    Merge remote-tracking branch 'anastasia/IDI-146'

    * anastasia/IDI-146:
      IDI-146: Add a minified infusion alongside the regular one
      IDI-146: Revert back to un-minified Infusion
      IDI-146: Replace MyInfusion.js with a minified version
      IDI-146: Update to latest Amara api and data format
    jobara committed Jan 25, 2016
Commits on Jan 22, 2016
  1. @acheetham
  2. @acheetham
Commits on Jan 21, 2016
  1. @acheetham
Commits on Jan 15, 2016
  1. @acheetham
Commits on Aug 4, 2015
  1. @acheetham
Commits on Jul 23, 2015
  1. @acheetham
Commits on Jul 22, 2015
  1. @acheetham
Commits on Jul 21, 2015
  1. @acheetham
Commits on Feb 11, 2014
  1. @jobara

    Merge remote-tracking branch 'maxstarkenburg/fix-link-to-demo'

    * maxstarkenburg/fix-link-to-demo:
      fix the links to the demo.
    jobara committed Feb 11, 2014
  2. @maxstarkenburg

    fix the links to the demo.

    The links currently there are 404 (at least to me, an outside user who
    is reviewing video-player-related stuff). Once I finally URL-hacked and
    found them, I discovered what a nice player it looked like.
    maxstarkenburg committed Feb 11, 2014
Commits on Oct 1, 2013
  1. @yzen

    Merge remote-tracking branch 'jobara/VP-317'

    * jobara/VP-317:
      VP-317: Fixed mediaelement dependencies.
      VP-317: linting
      VP-317: Updated the README file
      VP-317: correcting version number
      VP-317: can take in packageName as an argument
      VP-317: Restructured reference to the source files
      VP-317: Switched to use the modulefiles task
      VP-317: Using individual dependency files
      VP-317: Basic module build system
    yzen committed Oct 1, 2013
  2. @jobara

    VP-317: Fixed mediaelement dependencies.

    Was missing a slash in the path to the mediaelement.js file.
    jobara committed Oct 1, 2013
Commits on Sep 30, 2013
  1. @jobara

    VP-317: linting

    jobara committed Sep 30, 2013
Commits on Sep 19, 2013
  1. @jobara

    VP-317: Updated the README file

    jobara committed Sep 19, 2013
  2. @jobara

    VP-317: correcting version number

    jobara committed Sep 19, 2013
  3. @jobara

    VP-317: can take in packageName as an argument

    can pass in the name to use for zip and js file by using --packageName="name"
    jobara committed Sep 19, 2013
  4. @jobara

    VP-317: Restructured reference to the source files

    Removed the buildfiles function in favour of a declarative reference.
    jobara committed Sep 19, 2013
  5. @jobara

    VP-317: Switched to use the modulefiles task

    Using the modulefiles task from fluid for assembling the package files.
    jobara committed Sep 19, 2013
Commits on Sep 11, 2013
  1. @jobara

    VP-317: Using individual dependency files

    Each internal module now has it's own dependency file.
    jobara committed Sep 11, 2013
Commits on Sep 10, 2013
  1. @jobara

    VP-317: Basic module build system

    Implemented a basic module build system for VP. This will allow for building all or parts of the VideoPlayer into a concatenated file.
    jobara committed Sep 10, 2013
Commits on Sep 6, 2013
  1. @jobara

    Merge remote-tracking branch 'heidi/VP-192'

    * heidi/VP-192:
      VP-192: json ref tweaked for transcript highlight fix
      VP-192: Captions working
      VP-192: Tweaked json to send only subtitles to parser and it works
      VP-192: Tweaked json to send only subtitles to parser and it works
      VP-192: Updated URLs to new API but not sure which json the transcript parser is expecting
    jobara committed Sep 6, 2013
  2. @heidiv
  3. @heidiv

    VP-192: Captions working

    heidiv committed Sep 6, 2013
Commits on Sep 5, 2013
  1. @heidiv
  2. @heidiv
  3. @heidiv

    VP-192: Updated URLs to new API but not sure which json the transcrip…

    …t parser is expecting
    heidiv committed Sep 5, 2013
Commits on May 3, 2013
  1. @michelled

    Merge remote-tracking branch 'jobara/VP-310'

    * jobara/VP-310:
      VP-310: Fixed path errors in GruntFile.js
      VP-310 Additional changes to the README.txt
      VP-310: updated the README.txt
      VP-310: Removed docs from the zip.
      VP-310: added version number to zip filename
      VP-310: Added a README.txt file
      VP-310: Added ReleaseNotes.txt to built packages
      VP-310: Renamed README.txt to ReleaseNotes.txt
      VP-310: Added compression
      VP-310: Fixed a pathing issue
      VP-310: Added minification
      VP-310: started Gruntfile with basic tasks
      VP-310: Added package.json
    michelled committed May 3, 2013
  2. @jobara

    VP-310: Fixed path errors in GruntFile.js

    The paths to mediaelement.js and VideoPlayer_trasncript.js had errors in them.
    jobara committed May 3, 2013
  3. @jobara
  4. @jobara

    VP-310: updated the README.txt

    jobara committed May 3, 2013