summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-30When changing the album cover, find and retarget any other albums which were ↵Bharat Mediratta
using the old item as their album cover. Fixes #1978.
2013-01-30Automated update of .build_number to 312 for branch masterAutomatic Build Number Updater
Last update: 0ab40de11d65476454d4bf1129916a6856001002 (1 commits ago)
2013-01-30Merge pull request #112 from shadlaws/fix_1968Bharat Mediratta
#1968 - Improve album cover generation/removal/etc.
2013-01-30Automated update of .build_number to 311 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (5 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-30Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.Bharat Mediratta
Create a siblings() function which pulls together the siblings_callback function and makes it a more palatable API.
2013-01-30Automated update of .build_number to 310 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (3 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-30Protect admins from themselves - in case an admin changed theBharat Mediratta
watermark.name setting to something terrible by accident via Admin > Advanced, we'll just use the basename. Fixes #1977.
2013-01-30Automated update of .build_number to 309 for branch masterAutomatic Build Number Updater
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (1 commits ago)
2013-01-30Don't concatenate tainted strings in JS. Fixes #1976.Bharat Mediratta
2013-01-30Automated update of .build_number to 308 for branch masterAutomatic Build Number Updater
Last update: a983e8748e6e6667e968e96f8f0994f49b763b73 (1 commits ago)
2013-01-30Improve the display context API to return a "siblings_callback" fieldBharat Mediratta
containing a callback that returns all the siblings. Fixes #1975.
2013-01-30Automated update of .build_number to 307 for branch masterAutomatic Build Number Updater
Last update: 861e8628f5d847cbf5bc3cc9f94254514e8296a8 (1 commits ago)
2013-01-30Merge pull request #110 from mikeage/g2_importBharat Mediratta
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
2013-01-30 #1973 Handle redirected G2 URLs for tags, including g2_itemId passedMike Miller
2013-01-30#1968 - Improve album cover generation/removal/etc.shadlaws
- Added stanza to Item_Model::save that handles when cover id is null. - Added logic to graphics::generate to copy/convert album cover thumbs from their item thumbs to ensure they're always jpg, and eliminate the possibility that we copy/convert a dirty thumb. - Redirected other places in code where we want to do one of the above two things to use these two functions instead (gallery_event::item_updated_data_file, item::make_album_cover, item::remove_album_cover). - Improved validation in Item_Model so only albums can have covers and all covers must be non-albums. - Added unit tests to Graphics_Helper_Test.
2013-01-29Automated update of .build_number to 306 for branch masterAutomatic Build Number Updater
Last update: 899590873bbc444a35654573473f3c7326a95f87 (1 commits ago)
2013-01-29Merge pull request #108 from shadlaws/fix_1970Bharat Mediratta
#1970 - Make add watermarks more secure and add unit tests.
2013-01-29Automated update of .build_number to 305 for branch masterAutomatic Build Number Updater
Last update: b7c73ee693473eef9b536fb05f8c2b190e47b866 (1 commits ago)
2013-01-29Merge pull request #105 from shadlaws/fix_1967Bharat Mediratta
#1967 - Improve how graphics::generate handles missing/bad images.
2013-01-29#1970 - Make add watermarks more secure and add unit tests.shadlaws
This follows #1855 and #1951... - Ensured that invalid or illegal files are not added even if they have valid extensions. - Added unit tests (currently there aren't any...)
2013-01-29#1967 - Improve how graphics::generate handles missing/bad images.shadlaws
- Made missing_photo match the image format (jpg, png, etc.). - Swapped missing_photo.png for missing_photo.jpg since it's likely to require less conversion to match. - Improved error messages to user when things go wrong. - Ensured that missing image placeholders are always copied when there's an error. - Ensured we don't mistake no file output for a correct file output (delete target before attempt). - Restructured graphics::generate a bit to work better with above changes. - Added unit tests for graphics::generate.
2013-01-29Automated update of .build_number to 304 for branch masterAutomatic Build Number Updater
Last update: cf58e064d462eae6a1973cdf146e4867bf539357 (1 commits ago)
2013-01-29Merge pull request #106 from shadlaws/fix_1945Bharat Mediratta
#1945 - Extend legal_file helper functions.
2013-01-29Automated update of .build_number to 303 for branch masterAutomatic Build Number Updater
Last update: 23c6c507526ec1fc4a7ff80afb154341d75e9cab (1 commits ago)
2013-01-29Merge pull request #107 from shadlaws/fix_1969Bharat Mediratta
#1969 - Give graphics events the ability to override the standard process
2013-01-28#1945 - Extend legal_file helper functions.shadlaws
- Added get_types_by_extension function, which is a merged version of get...types_by_extension functions (similar to get_extensions). - Added optional extension argument to get...extensions functions similar to get...types_by_extension functions. - Added unit tests. Now, every legal_file function has one. - Restructured helper file to include caches. - Added array_unique to get...types (derived from get...types_by_extension, which can be many-to-one). - Edited server_add, uploader, and item model to use new functionality.
2013-01-28Automated update of .build_number to 302 for branch masterAutomatic Build Number Updater
Last update: daad29e5c391d15d99cd8f3f5af8aaf3e3b76749 (1 commits ago)
2013-01-28Merge pull request #109 from shadlaws/fix_1971Bharat Mediratta
#1971 - Make resequence_child_weights_test unit test more reliable.
2013-01-28#1971 - Make resequence_child_weights_test unit test more reliable.shadlaws
- Set the sort_column of the parent album to id, which has no possibility of being identical between the two photos. - Now, the reweighting will reverse the order even if they were created during the same second.
2013-01-27#1969 - Give graphics events the ability to override the standard process.shadlaws
While graphics_rotate, graphics_resize, and graphics_composite events already exist, they don't have the ability to *override* the standard process. This makes it a bit tricky when you want to replace the standard procedure with another (e.g. use jpegtran to perform lossless jpg rotation). Solution: - make a temp filename. - tell the events to use it as the output file. - if an event makes something, use it and skip the standard process.
2013-01-27Automated update of .build_number to 301 for branch masterAutomatic Build Number Updater
Last update: 0c214d85e63fc74fb315ca1b542251d5c6112201 (1 commits ago)
2013-01-27Add a key on relative_path_cache in the items table to improve performance ↵Bharat Mediratta
on installs that use File_Proxy heavily. Fixes #1920.
2013-01-26Automated update of .build_number to 300 for branch masterAutomatic Build Number Updater
Last update: c508fc4a45f0af94c89ba7f0ac1533244a7f35a3 (1 commits ago)
2013-01-26Merge pull request #104 from shadlaws/fix_1966Bharat Mediratta
#1966 - "Fix your Gallery" shows 60/59 items completed.
2013-01-26Automated update of .build_number to 299 for branch masterAutomatic Build Number Updater
Last update: 847a825b2527584662da277fd6a47921287cbbf4 (1 commits ago)
2013-01-26Merge pull request #91 from shadlaws/fix_1946_1947Bharat Mediratta
#1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions
2013-01-26#1966 - "Fix your Gallery" shows 60/59 items completed.shadlaws
- Fixed counter in gallery_task::fix that was often one too many. For FIX_STATE_RUN_MISSING_ACCESS_CACHES, changed this: $stack = explode(" ", $task->get("stack")); To this: $stack = array_filter(explode(" ", $task->get("stack")));
2013-01-26#1946, 1947 - Make altered names/slugs more user-friendly, make ↵shadlaws
conflict-finding code check filenames with no extensions - Reduced from four places that alter names/slugs to two (one to populate empty slugs, one to handle conflicting names/slugs). - For empty slugs, fill with generic human-readable name (e.g. "photo") instead of random value. - For conflicting names/slugs, add suffix that's sequential (e.g. "-01"), only using random after 99 conflicts. - Made conflict-finding code check filenames with no extensions. - Renamed _randomize_name_or_slug_on_conflict to _check_and_fix_conflicts. - Added unit tests. Also cleaned up existing unit tests to reflect new logic and removed a redundant test. - Added installer logic to correct existing items now considered in conflict. - Revised gallery_task to look for duplicate names based on new criteria.
2013-01-25Automated update of .build_number to 298 for branch masterAutomatic Build Number Updater
Last update: 066f4cdf8e44585790711797baf9130511d4203d (1 commits ago)
2013-01-25Merge pull request #103 from shadlaws/fix_1965Bharat Mediratta
#1965 - Improve sanity checks and copy/convert/process logic for rotate and resize
2013-01-25Automated update of .build_number to 297 for branch masterAutomatic Build Number Updater
Last update: 776fe75ceb93f8eb729d13d58fb411d6ceeb9270 (1 commits ago)
2013-01-25Merge pull request #96 from shadlaws/fix_1951Bharat Mediratta
#1951 - Make metadata generation more flexible (photo and movie helpers).
2013-01-26#1951 - Make metadata generation more flexible (photo and movie helpers).shadlaws
- added photo_get_file_metadata and movie_get_file_metadata events - modified photo::get_file_metadata and movie::get_file_metadata to use them - ensure that non-readable files throw exceptions - redirected other photo metadata calls in core to photo::get_file_metadata (the helper function already exists, but in many places getimagesize is still called directly) - added some unit tests (neither of the functions above had one)
2013-01-25#1965 - Improve sanity checks and copy/convert/process logic for rotate and ↵shadlaws
resize. - resize: ensured that resize is skipped *only* if the metadata is valid or the options are well-defined and would upscale. Then, if resize is skipped, check to see if it still needs to be converted. Previous conditions would allow a small PNG to get copied to a JPG, and would allow a corrupted JPG to be copied to the output. - rotate: add checks for empty file or empty options. - use get_file_metadata instead of direct getimagesize call. - add unit tests for rotate and resize, including some for corrupted input files and missing options.
2013-01-25Automated update of .build_number to 296 for branch masterAutomatic Build Number Updater
Last update: 7e710366de1514c900807881aaf2fdd42a467fe9 (1 commits ago)
2013-01-25Fix an assignment-instead-of-comparison bug. I wish PHP had a betterBharat Mediratta
warning system for this stuff. In this case it's innocuous because the UI only allows you to rearrange stuff inside a single album, so the assignment doesn't do anything. Fixes #1914.
2013-01-25Automated update of .build_number to 295 for branch masterAutomatic Build Number Updater
Last update: c71f3091d2c3d87467640c0d7a0e701c259dd519 (1 commits ago)
2013-01-25Merge pull request #102 from shadlaws/fix_1964Bharat Mediratta
#1964 - TMPPATH is mis-defined in index.php.