From: GitHub <no...@gi...> - 2012-12-31 18:34:53
|
Branch: refs/heads/3.0.x Home: https://github.com/gallery/gallery3 Commit: 381bd0e569140ebc74eaf7971771d34a5a625f62 https://github.com/gallery/gallery3/commit/381bd0e569140ebc74eaf7971771d34a5a625f62 Author: Mike Mayer <mik...@vm...> Date: 2012-10-18 (Thu, 18 Oct 2012) Changed paths: M .build_number M installer/install.sql M modules/comment/helpers/comment_installer.php M modules/comment/helpers/comment_rss.php M modules/comment/module.info M modules/gallery/controllers/combined.php M modules/gallery/css/gallery.css M modules/gallery/helpers/locales.php M modules/gallery/views/form_uploadify.html.php M modules/recaptcha/helpers/recaptcha.php M modules/tag/helpers/item_tags_rest.php M modules/tag/helpers/tag.php M modules/tag/helpers/tag_items_rest.php M system/helpers/expires.php Log Message: ----------- Merge pull request #2 from gallery/master Retrofit gallery/master into mikemayer67/gallery3 Commit: 05bd83220e3f39c0322fbf64f9f45c3bf1e60b36 https://github.com/gallery/gallery3/commit/05bd83220e3f39c0322fbf64f9f45c3bf1e60b36 Author: Michael A Mayer <mik...@vm...> Date: 2012-10-24 (Wed, 24 Oct 2012) Changed paths: M modules/user/controllers/users.php Log Message: ----------- Fixed event sent from User_Controller::_get_change_email_form incorrect event: user_change_password_form corrected event: user_change_email_form Commit: f2a32526be0a307005052105ed09bc337e29d333 https://github.com/gallery/gallery3/commit/f2a32526be0a307005052105ed09bc337e29d333 Author: Automatic Build Number Updater <bha...@me...> Date: 2012-12-17 (Mon, 17 Dec 2012) Changed paths: M .build_number Log Message: ----------- Automated update of .build_number to 264 for branch master Last update: 1f351c16d397012c83d193a76ccffd4030aba17b (1 commits ago) Commit: ce68177ba0dc27010435e55b79cbea453751f8ee https://github.com/gallery/gallery3/commit/ce68177ba0dc27010435e55b79cbea453751f8ee Author: shadlaws <sh...@sh...> Date: 2012-12-18 (Tue, 18 Dec 2012) Changed paths: M installer/install.sql M modules/gallery/helpers/gallery_installer.php M modules/gallery/helpers/graphics.php M modules/gallery/helpers/movie.php M modules/gallery/module.info Log Message: ----------- [#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)] - graphics helper: add movie_extract_frame event to generate function (allows modules to add to the options sent to movie::extract_frame or to generate the thumbnail on their own without movie::extract_frame) - movie helper: add extra optional argument to movie::extract_frame (can add ffmpeg arguments and/or change the frame extract time) - gallery_installer: add movie_extract_time module variable, update to v53 - module.info: update to v53 - install.sql: update to v53 Commit: da3d37cdb1f40c3673e1eb787112c07b3165da07 https://github.com/gallery/gallery3/commit/da3d37cdb1f40c3673e1eb787112c07b3165da07 Author: Bharat Mediratta <bh...@me...> Date: 2012-12-18 (Tue, 18 Dec 2012) Changed paths: M installer/install.sql M modules/gallery/helpers/gallery_installer.php M modules/gallery/helpers/graphics.php M modules/gallery/helpers/movie.php M modules/gallery/module.info Log Message: ----------- Merge pull request #81 from shadlaws/master [#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)] Commit: 594611b1009b88ddfb0ec0ee3f24229a8f0030af https://github.com/gallery/gallery3/commit/594611b1009b88ddfb0ec0ee3f24229a8f0030af Author: Automatic Build Number Updater <bha...@me...> Date: 2012-12-18 (Tue, 18 Dec 2012) Changed paths: M .build_number Log Message: ----------- Automated update of .build_number to 265 for branch master Last update: f2a32526be0a307005052105ed09bc337e29d333 (1 commits ago) Commit: 7910084224315b2d26b447381863603ea3e4e649 https://github.com/gallery/gallery3/commit/7910084224315b2d26b447381863603ea3e4e649 Author: Bharat Mediratta <bh...@me...> Date: 2012-12-18 (Tue, 18 Dec 2012) Changed paths: M modules/gallery/helpers/item_rest.php Log Message: ----------- Check for "add" instead of "edit" in item_rest::post. Fixes #1929. Commit: 22ba4f1df3774d56c81ea627eb3d0cc9c4320c23 https://github.com/gallery/gallery3/commit/22ba4f1df3774d56c81ea627eb3d0cc9c4320c23 Author: Automatic Build Number Updater <bha...@me...> Date: 2012-12-18 (Tue, 18 Dec 2012) Changed paths: M .build_number Log Message: ----------- Automated update of .build_number to 266 for branch master Last update: 594611b1009b88ddfb0ec0ee3f24229a8f0030af (1 commits ago) Commit: 58ced4d25d711a058f6befd4291d5c3e4b3bac94 https://github.com/gallery/gallery3/commit/58ced4d25d711a058f6befd4291d5c3e4b3bac94 Author: Bharat Mediratta <bh...@me...> Date: 2012-12-20 (Thu, 20 Dec 2012) Changed paths: M modules/user/controllers/users.php Log Message: ----------- Merge pull request #74 from mikemayer67/master Correction of event sent from Users_Controller::_get_change_email_form Fixes #1930 Commit: 7777baa156c2fbc65ca93b9533212ef22ed90105 https://github.com/gallery/gallery3/commit/7777baa156c2fbc65ca93b9533212ef22ed90105 Author: Automatic Build Number Updater <bha...@me...> Date: 2012-12-20 (Thu, 20 Dec 2012) Changed paths: M .build_number Log Message: ----------- Automated update of .build_number to 267 for branch master Last update: 22ba4f1df3774d56c81ea627eb3d0cc9c4320c23 (1 commits ago) Commit: 8300c867a1eb2a709aa0a0c019dfa47a670024dc https://github.com/gallery/gallery3/commit/8300c867a1eb2a709aa0a0c019dfa47a670024dc Author: shadlaws <sh...@sh...> Date: 2012-12-30 (Sun, 30 Dec 2012) Changed paths: M modules/gallery/css/gallery.css M modules/gallery/models/item.php M modules/gallery/views/movieplayer.html.php Log Message: ----------- #1931, #1932, #1933, #1934 - movieplayer view and movie_img function in items model Many changes to movieplayer view and movie_img function in items model: - include control bar height when dimensioning movie player - provide a default "guess" at height and width when they are set as zero in items table - resize movie player once the video is loaded based on its actual metadata - add get_movie_img event to provide flexibility for altering/replacing the default Flowplayer v3 --HG-- extra : rebase_source : 5d1e9bb66ebf3e3fed5e1b9ee63790a204f21450 Commit: 009f15820fca313186272bcf88c2df22d39e3b10 https://github.com/gallery/gallery3/commit/009f15820fca313186272bcf88c2df22d39e3b10 Author: Bharat Mediratta <bh...@me...> Date: 2012-12-31 (Mon, 31 Dec 2012) Changed paths: M modules/gallery/css/gallery.css M modules/gallery/models/item.php M modules/gallery/views/movieplayer.html.php Log Message: ----------- Merge pull request #83 from shadlaws/master #1931, #1932, #1933, #1934 - movieplayer view and movie_img function in items model Commit: dc3fd9d037871a3ac8b28ab859302ee6ceca3844 https://github.com/gallery/gallery3/commit/dc3fd9d037871a3ac8b28ab859302ee6ceca3844 Author: Automatic Build Number Updater <bha...@me...> Date: 2012-12-31 (Mon, 31 Dec 2012) Changed paths: M .build_number Log Message: ----------- Automated update of .build_number to 268 for branch master Last update: 7777baa156c2fbc65ca93b9533212ef22ed90105 (1 commits ago) Commit: 82ed2c1e590cdcf615dcfcc405c72e3ec1fb4217 https://github.com/gallery/gallery3/commit/82ed2c1e590cdcf615dcfcc405c72e3ec1fb4217 Author: Bharat Mediratta <bh...@me...> Date: 2012-12-31 (Mon, 31 Dec 2012) Changed paths: M installer/install.sql M modules/gallery/css/gallery.css M modules/gallery/helpers/gallery_installer.php M modules/gallery/helpers/graphics.php M modules/gallery/helpers/item_rest.php M modules/gallery/helpers/movie.php M modules/gallery/models/item.php M modules/gallery/module.info M modules/gallery/views/movieplayer.html.php M modules/user/controllers/users.php Log Message: ----------- Merge branch 'master' into 3.0.x Compare: https://github.com/gallery/gallery3/compare/aba474b799f2...82ed2c1e590c |