Don't show the sidebar on error pages - it just increases the chances
that we'll compound the error.  Instead, focus on the error or the
login form.  Fixes #1921.
Automated update of .build_number to 256 for branch master
Last update: 31681bf834d5dc560b9898d9c30903f08ecb1966 (1 commits ago)
Elevate X-Frame-Options from all admin and user pages to all PHP
responses.  Fixes #1922.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 257 for branch master
Last update: 31681bf834d5dc560b9898d9c30903f08ecb1966 (3 commits ago)
[#1907] Added administrative variable to set lock timeout.
[#1907] Added code needed for the case when a user upgrades.
Merge pull request #75 from chalbertgit/master

Ticket #1907, Add lock timeout as an editable variable in admin=>settings=>advanced
Automated update of .build_number to 258 for branch master
Last update: 1ac8c883ab0db973659228f351d5b608200e6a56 (1 commits ago)
Eliminate the search context if we encounter an item that cannot be
found in the search results.  Fixes #1923.
Automated update of .build_number to 259 for branch master
Last update: f457cd283cdfd9011d76ae96872e1f08bb219baf (1 commits ago)
bug fix: updated file_proxy.php to use legal_file helper instead of 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
Automated update of .build_number to 260 for branch master
Last update: de101829d1f79742bec7a8e1afa01eb416dda211 (1 commits ago)
search within the current album by default

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.
fix, use $current->score
Bugfix follow-on to a74e3aea6f0bdde210c91622535af3e58aa1e9fd - thanks to chilversc.
Automated update of .build_number to 261 for branch master
Last update: 7c62c67d56e854f69a411dd56c48ef066f951c48 (1 commits ago)
Merge pull request #76 from chilversc/search-filter-album

Search within current album.  Resolves #1402
Automated update of .build_number to 262 for branch master
Last update: b0618aab7a72eb0e5495e3c5f4d2a57f343c0076 (1 commits ago)
[#1924, #1925, #1927 - enhance compatibility with movies (movie helper) and 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)