[cvs] commit: incubator/oscar/admin process.php view.php incubator/oscar/lib Oscar.php incubator/oscar/lib/Convert ffmpeg.php mplayer.php

[Michael Rubinsky]

mrubinsk    2007-09-13 17:58:36 EDT

  Modified files:
    oscar/admin          process.php view.php 
    oscar/lib            Oscar.php 
    oscar/lib/Convert    ffmpeg.php mplayer.php 
  Log:
  Move thumbnails and video during the 'view' task...display it as "View and finalize" on the page to make it more obvious you can't skip that step.
  Remove this js include - not sure what it was there for maybe from previous flash player code?
  
  Revision  Changes    Path
  1.6       +2 -2      incubator/oscar/admin/process.php
  1.5       +1 -2      incubator/oscar/admin/view.php
  1.11      +0 -12     incubator/oscar/lib/Convert/ffmpeg.php
  1.8       +0 -10     incubator/oscar/lib/Convert/mplayer.php
  1.26      +30 -8     incubator/oscar/lib/Oscar.php

  Chora Links:
  http://cvs.horde.org/diff.php/incubator/oscar/admin/process.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/admin/view.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/ffmpeg.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/mplayer.php?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Oscar.php?r1=1.25&r2=1.26&ty=u