summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-23 #1952 Add bulk tagging to the Organize module.Mike Miller
Allow a user to highlight one or more items (images, videos, or albums), and enter a tag (or tags, comma delimited) and apply it to all of the selected items. The code is based on the batchtag module. If the tags module is not enabled, no changes to the Organize UI will be shown.
2013-01-20#1949 - Fix album thumb mime types given by data_rest and file_proxyshadlaws
Correct result: always "image/jpeg" Old data_rest result: mime of cover item Old file_proxy result: mime of album item (null)
2013-01-19Automated update of .build_number to 274 for branch masterAutomatic Build Number Updater
Last update: 2c584d5d23a346b085259a717055fbbb6c737da4 (1 commits ago)
2013-01-19Merge pull request #89 from shadlaws/fix_1942Bharat Mediratta
#1942 - Make data_rest and file_proxy more consistent
2013-01-19Automated update of .build_number to 273 for branch masterAutomatic Build Number Updater
Last update: 79acf3abe8b3ab55b084e9c2ff2624d5ad7971e6 (1 commits ago)
2013-01-19Merge pull request #88 from shadlaws/fix_1941Bharat Mediratta
#1941, 1948 - Fix possible warnings in movie and graphics helpers, add functions to convert between seconds and hh:mm:ss.dd (and their unit tests).
2013-01-19Automated update of .build_number to 272 for branch masterAutomatic Build Number Updater
Last update: 9359e75ca3e54e0a88ef2e5c82592406952d71fa (3 commits ago)
2013-01-20Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-20Simplify get_photo_types_by_extension_test and ↵Bharat Mediratta
get_movie_types_by_extension_test.
2013-01-19Automated update of .build_number to 271 for branch masterAutomatic Build Number Updater
Last update: 9359e75ca3e54e0a88ef2e5c82592406952d71fa (1 commits ago)
2013-01-19Merge pull request #93 from shadlaws/fix_1944Bharat Mediratta
#1944 - Fix possible warnings in legal_file::get_photo_types_by_extension and legal_file::get_movie_types_by_extension.
2013-01-19Automated update of .build_number to 270 for branch masterAutomatic Build Number Updater
Last update: 3a3c21dfc42b94a5340634d9c0b19acf83b1fedb (6 commits ago)
2013-01-20Change the logic for finding controllers to use glob() but drop anythingBharat Mediratta
that we can find is git-ignore'd.
2013-01-19#1942 - Make data_rest and file_proxy more consistent - several minor ↵shadlaws
documentation/formatting changes. No actual functionality changed here.
2013-01-19#1941, 1948 - Fix possible warnings in movie and graphics helpers, add ↵shadlaws
functions to convert between seconds and hh:mm:ss.dd. Also add unit tests for new movie helper functions.
2013-01-19#1944 - Fix possible warnings in legal_file::get_photo_types_by_extension ↵shadlaws
and legal_file::get_movie_types_by_extension. Added unit tests for these two functions, too.
2013-01-18Merge pull request #92 from shadlaws/fix_1943Bharat Mediratta
#1943 - Make legal_file::change_extension more robust.
2013-01-18#1943 - Make legal_file::change_extension more robust.shadlaws
Previously would fail with dots in the directory but no extension. Added unit tests to verify the new change works.
2013-01-17Update golden files.Bharat Mediratta
2013-01-17Follow-on to 94b26e506c339f50b8d094057bffc1877a79afa9 - make the new legal_fileBharat Mediratta
functions more robust when passed an unknown extension. Fixes Item_Model_Test.
2013-01-14Fix up some indentation.Bharat Mediratta
2013-01-13Merge pull request #86 from mikeage/tag_nameBharat Mediratta
Tags by name (includes a G2 mapping) Fixes #1940.
2013-01-13Tags by name (includes a G2 mapping)Mike Miller
2013-01-02Automated update of .build_number to 269 for branch masterAutomatic Build Number Updater
Last update: dc3fd9d037871a3ac8b28ab859302ee6ceca3844 (1 commits ago)
2013-01-02Merge pull request #84 from shadlaws/masterBharat Mediratta
#1919 - change `convert -v` to `convert -version`
2013-01-01#1919 - change `convert -v` to `convert -version`shadlaws
2012-12-31Automated update of .build_number to 268 for branch masterAutomatic Build Number Updater
Last update: 7777baa156c2fbc65ca93b9533212ef22ed90105 (1 commits ago)
2012-12-31Merge pull request #83 from shadlaws/masterBharat Mediratta
#1931, #1932, #1933, #1934 - movieplayer view and movie_img function in items model
2012-12-30#1931, #1932, #1933, #1934 - movieplayer view and movie_img function in ↵shadlaws
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
2012-12-20Automated update of .build_number to 267 for branch masterAutomatic Build Number Updater
Last update: 22ba4f1df3774d56c81ea627eb3d0cc9c4320c23 (1 commits ago)
2012-12-20Merge pull request #74 from mikemayer67/masterBharat Mediratta
Correction of event sent from Users_Controller::_get_change_email_form Fixes #1930
2012-12-18Automated update of .build_number to 266 for branch masterAutomatic Build Number Updater
Last update: 594611b1009b88ddfb0ec0ee3f24229a8f0030af (1 commits ago)
2012-12-18Check for "add" instead of "edit" in item_rest::post. Fixes #1929.Bharat Mediratta
2012-12-18Automated update of .build_number to 265 for branch masterAutomatic Build Number Updater
Last update: f2a32526be0a307005052105ed09bc337e29d333 (1 commits ago)
2012-12-18Merge pull request #81 from shadlaws/masterBharat Mediratta
[#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)]
2012-12-18[#1928 - Make thumbnail generation more flexible for movies (graphics and ↵shadlaws
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
2012-12-17Automated update of .build_number to 264 for branch masterAutomatic Build Number Updater
Last update: 1f351c16d397012c83d193a76ccffd4030aba17b (1 commits ago)
2012-12-17Minor whitespace fix.Bharat Mediratta
2012-12-17Automated update of .build_number to 263 for branch masterAutomatic Build Number Updater
Last update: 989c24eea3bf01ec621ff3e6ad8a3d58debe0513 (1 commits ago)
2012-12-17Merge pull request #80 from shadlaws/masterBharat Mediratta
[#1924, #1925, #1927 - enhance compatibility with movies (movie helper) and file types (legal_file helper)]
2012-12-16Merge builds 261 and 262 from origin.shadlaws
2012-12-16[#1924, #1925, #1927 - enhance compatibility with movies (movie helper) and ↵shadlaws
file types (legal_file helper)] bug fix: modify movie.php helper to take DAR (display aspect ratio) into account in get_file_metadata bug fix / enhancement: add duration to get_file_metadata output bug fix: modify movie.php helper to use correct resolution and duration from get_file_metadata in extract_frame bug fix: modify movie.php helper to be more robust against ffmpeg failures and limitations, including adding "-threads 1" argument if needed enhancement: modified to include ordered maps of extensions to MIME types (get_photo_types_by_extension and get_movie_types_by_extension functions), modified get_file_metadata in movie and photo helpers to use them gallery_installer, module.info, install.sql: updated to v52 with m4v mime correction code (was video/mp4)
2012-12-14Automated update of .build_number to 262 for branch masterAutomatic Build Number Updater
Last update: b0618aab7a72eb0e5495e3c5f4d2a57f343c0076 (1 commits ago)
2012-12-14Merge pull request #76 from chilversc/search-filter-albumBharat Mediratta
Search within current album. Resolves #1402
2012-12-14Automated update of .build_number to 261 for branch masterAutomatic Build Number Updater
Last update: 7c62c67d56e854f69a411dd56c48ef066f951c48 (1 commits ago)
2012-12-14Bugfix follow-on to a74e3aea6f0bdde210c91622535af3e58aa1e9fd - thanks to ↵Bharat Mediratta
chilversc.
2012-12-14fix, use $current->scoreChris Chilvers
2012-12-14search within the current album by defaultChris Chilvers
When searching, limit search results to the current album. In the search results screen, display which album was searched and provide a link to search the whole gallery.
2012-12-10Automated update of .build_number to 260 for branch masterAutomatic Build Number Updater
Last update: de101829d1f79742bec7a8e1afa01eb416dda211 (1 commits ago)
2012-12-10bug fix: updated file_proxy.php to use legal_file helper instead of ↵shadlaws
hard-coded list of movie file extensions. bug fix: updated uploader.php to use legal_file helper instead of hard-coded list of movie file extensions. Fixes #1926