[Commits] [fluid-project/videoPlayer] e239a6: Merge branch 'master' into FLUID-4587

GitHub noreply at github.com
Fri Feb 17 21:37:07 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: e239a6cfb7bee47b47df9451374559aed3b0cdc2
      https://github.com/fluid-project/videoPlayer/commit/e239a6cfb7bee47b47df9451374559aed3b0cdc2
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    A demos/mammals.js
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
  M tests/js/IntervalEventsConductor-IntegrationTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4587

Conflicts:
	tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html


  Commit: a1c69337aafdaf0f7a41b9eb095d698d65c25766
      https://github.com/fluid-project/videoPlayer/commit/a1c69337aafdaf0f7a41b9eb095d698d65c25766
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/Mammals.html
  R demos/ReorganizeFuture.en.json
  R demos/ReorganizeFuture.fr.json
  R demos/ReorganizeFuture.mp4
  R demos/ReorganizeFuture.webm
  M demos/VideoPlayer.html
  A demos/images/bg-header.png
  A demos/images/bg-iceberg.jpg
  A demos/images/logo.png
  A demos/images/search.png
  A demos/mammals.css
  A demos/mammals.js
  A demos/videos/Mammals/Mammals.en.json
  A demos/videos/Mammals/mammals.mp4
  A demos/videos/Mammals/mammals.webm
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.mp4
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.webm
  A demos/videos/PolarMammals/PolarMammals.en.json
  A demos/videos/PolarMammals/PolarMammals.mp4
  A demos/videos/PolarMammals/PolarMammals.webm
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.mp4
  A demos/videos/ReorganizeFuture/ReorganizeFuture.webm
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html

  Log Message:
  -----------
  Merge branch 'FLUID-4587'

* FLUID-4587:
  FLUID-4587: Fixed the integration test for intervalEventsConductor component.
  FLUID-4587: Pulling the demo init script out of the html file.
  FLUID-4587: Fixing the mammals demo to work with the new controllers styling.
  FLUID-4587: Corrected the caption files.
  FLUID-4587: Fixed the issues with container overlapping and video loading.
  FLUID-4587: Adding the Mammals demo.
  FLUID-4587: Adding some videos for the demo. Restructuring the demos folder.


Compare: https://github.com/fluid-project/videoPlayer/compare/6375bf9...a1c6933


More information about the Commits mailing list