Merge pull request #2 from gallery/master

Retrofit gallery/master into mikemayer67/gallery3
Fixed event sent from User_Controller::_get_change_email_form
   incorrect event: user_change_password_form
   corrected event: user_change_email_form
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