[gallery/gallery3] f212f6: #2003 - Add admin/movies screen.

  Branch: refs/heads/3.0.x
  Home:   https://github.com/gallery/gallery3
  Commit: f212f6a794c4aff96446b99e4824a9e2c8cfb259
      https://github.com/gallery/gallery3/commit/f212f6a794c4aff96446b99e4824a9e2c8cfb259
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    A modules/gallery/controllers/admin_movies.php
    M modules/gallery/helpers/gallery_event.php
    M modules/gallery/helpers/movie.php
    A modules/gallery/images/ffmpeg.png
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/admin_movies.html.php
    M modules/gallery/views/form_uploadify.html.php

  Log Message:
  -----------
  #2003 - Add admin/movies screen.
Added admin/movies screen analogous to the admin/graphics screen so the user can:
- see how FFmpeg is configured (path and version, similar to toolkits in admin/graphics)
- get some instructions on how to install FFmpeg if not found
- change the movie_allow_uploads setting
- ask Gallery to rebuild their movie thumbs
Specifics:
- admin_movies, admin_movies.html (new) - new Movies admin screen
- ffmpeg.png (new) - logo for admin screen
- movie::get_ffmpeg_version (new) - return version number and date of FFmpeg
- form_uploadify.html - change admin message if movie uploads are disabled
- gallery_event::admin_menu - added Movies link to Settings
- xss_data.txt - updated golden file for unit tests


  Commit: ea741a8457102b06992e6ecfb248bb71ca791840
      https://github.com/gallery/gallery3/commit/ea741a8457102b06992e6ecfb248bb71ca791840
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    A modules/gallery/controllers/admin_movies.php
    M modules/gallery/helpers/gallery_event.php
    M modules/gallery/helpers/movie.php
    A modules/gallery/images/ffmpeg.png
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/admin_movies.html.php
    M modules/gallery/views/form_uploadify.html.php

  Log Message:
  -----------
  Merge pull request #138 from shadlaws/fix_2003

#2003 - Add admin/movies screen.


  Commit: 6089374891407dda5da27bbceb9aa774004737b6
      https://github.com/gallery/gallery3/commit/6089374891407dda5da27bbceb9aa774004737b6
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 346 for branch master
Last update: 21acbbf549f3167d14c89270683ef06746552d75 (1 commits ago)


  Commit: 264e1e82b23f622e9a79f7834cfcbfb536eac4f6
      https://github.com/gallery/gallery3/commit/264e1e82b23f622e9a79f7834cfcbfb536eac4f6
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    R modules/digibug/config/digibug.php
    R modules/digibug/controllers/admin_digibug.php
    R modules/digibug/controllers/digibug.php
    R modules/digibug/helpers/digibug_event.php
    R modules/digibug/helpers/digibug_installer.php
    R modules/digibug/helpers/digibug_theme.php
    R modules/digibug/images/digibug_logo.png
    R modules/digibug/js/digibug.js
    R modules/digibug/models/digibug_proxy.php
    R modules/digibug/module.info
    R modules/digibug/tests/Digibug_Controller_Test.php
    R modules/digibug/views/admin_digibug.html.php
    R modules/digibug/views/digibug_form.html.php

  Log Message:
  -----------
  Digibug up and vanished.  Move the module to contrib for now.  This
will leave the module active in any existing installs that had it
active, but that shouldn't cause any negative impact.  Fixes #2002.


  Commit: c59adf96e7de86d1f4018dd6171452766e1842b9
      https://github.com/gallery/gallery3/commit/c59adf96e7de86d1f4018dd6171452766e1842b9
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    A modules/gallery/controllers/admin_movies.php
    M modules/gallery/helpers/gallery_event.php
    M modules/gallery/helpers/movie.php
    A modules/gallery/images/ffmpeg.png
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/admin_movies.html.php
    M modules/gallery/views/form_uploadify.html.php

  Log Message:
  -----------
  Merge branch 'master' into 3.0.x


  Commit: 1e2aafb8a748d3a93b241450c51aaa75c531c583
      https://github.com/gallery/gallery3/commit/1e2aafb8a748d3a93b241450c51aaa75c531c583
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Merge branch '3.0.x' of github.com:gallery/gallery3 into 3.0.x


Compare: https://github.com/gallery/gallery3/compare/d1718ffbd5b1...1e2aafb8a748

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb

__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]