[Commits] [fluid-project/videoPlayer] 324e77: FLUID-4546: Initial check-in of video player integ...

GitHub noreply at github.com
Mon Aug 20 14:33:10 EDT 2012


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 324e77ce46b7828ad76e511abb0d303afa3f0f97
      https://github.com/fluid-project/videoPlayer/commit/324e77ce46b7828ad76e511abb0d303afa3f0f97
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js
    A tests/html/TestVideo.webm
    A tests/html/VideoPlayer-IntegrationTest.html
    A tests/js/VideoPlayerIntegrationTests.js

  Log Message:
  -----------
  FLUID-4546: Initial check-in of video player integration test.


  Commit: 77f2d1df677b421b80ac2fac0e048d6da6ee2aeb
      https://github.com/fluid-project/videoPlayer/commit/77f2d1df677b421b80ac2fac0e048d6da6ee2aeb
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    R demos/ReorganizeFuture.en.vtt
    R demos/ReorganizeFuture.fr.vtt
    M js/MenuButton.js
    M js/ToggleButton.js
    M js/VideoPlayer_controllers.js
    A tests/html/MenuButton-test.html
    A tests/html/ToggleButton-test.html
    M tests/html/VideoPlayerControls-test.html
    A tests/js/MenuButtonTests.js
    A tests/js/TestUtils.js
    A tests/js/ToggleButtonTests.js
    M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4645


  Commit: 690ad70e5f593eeb8423bc076d3c563a4c8c370d
      https://github.com/fluid-project/videoPlayer/commit/690ad70e5f593eeb8423bc076d3c563a4c8c370d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_transcript.js
    M js/VideoPlayer_uiOptions.js
    A tests/html/TestTranscripts.en.json
    A tests/html/TestTranscripts.fr.json
    R tests/html/TestVideo.webm
    A tests/html/VideoPlayerTranscript-test.html
    M tests/js/VideoPlayerIntegrationTests.js
    A tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  1. Removed TestVideo.webm. Use the demo webm video instead;

2. Increased the timeout delay for the video to be fully loaded.

3. Merge branch 'demo' into FLUID-4645

Conflicts:
	js/VideoPlayer_transcript.js


  Commit: 3f10427a38e2242528b093436f80fb6387e294da
      https://github.com/fluid-project/videoPlayer/commit/3f10427a38e2242528b093436f80fb6387e294da
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js
    A tests/html/VideoPlayer-IntegrationTest.html
    A tests/js/VideoPlayerIntegrationTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/FLUID-4645' into demo

* cindyli/FLUID-4645:
  FLUID-4546: Initial check-in of video player integration test.


Compare: https://github.com/fluid-project/videoPlayer/compare/c2949219b0e6...3f10427a38e2


More information about the Commits mailing list