[gallery/gallery3] f212f6: #2003 - Add admin/movies screen.
GitHub <noreply-9UaJU3cA/F/[email protected]>
| Newsgroups | gmane.comp.web.gallery.cvs |
|---|---|
| Message-ID | <[email protected]> |
Branch: refs/heads/master
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.
Compare: https://github.com/gallery/gallery3/compare/21acbbf549f3...ea741a845710
------------------------------------------------------------------------------
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 ]