summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-01-16Manually resolved conflict after recent pull.Nathan Kinkade
2013-01-14Fix up some indentation.Bharat Mediratta
2013-01-13Merge pull request #86 from mikeage/tag_nameBharat Mediratta
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
2013-01-02Merge pull request #84 from shadlaws/masterBharat Mediratta
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
2012-12-31Merge pull request #83 from shadlaws/masterBharat Mediratta
2012-12-30#1931, #1932, #1933, #1934 - movieplayer view and movie_img function in items...shadlaws
2012-12-20Automated update of .build_number to 267 for branch masterAutomatic Build Number Updater
2012-12-20Merge pull request #74 from mikemayer67/masterBharat Mediratta
2012-12-18Automated update of .build_number to 266 for branch masterAutomatic Build Number Updater
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
2012-12-18Merge pull request #81 from shadlaws/masterBharat Mediratta
2012-12-18[#1928 - Make thumbnail generation more flexible for movies (graphics and mov...shadlaws
2012-12-17Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-12-17Automated update of .build_number to 264 for branch masterAutomatic Build Number Updater
2012-12-17Minor whitespace fix.Bharat Mediratta
2012-12-17Automated update of .build_number to 263 for branch masterAutomatic Build Number Updater
2012-12-17Merge pull request #80 from shadlaws/masterBharat Mediratta
2012-12-16Merge builds 261 and 262 from origin.shadlaws
2012-12-16[#1924, #1925, #1927 - enhance compatibility with movies (movie helper) and f...shadlaws
2012-12-14Automated update of .build_number to 262 for branch masterAutomatic Build Number Updater
2012-12-14Merge pull request #76 from chilversc/search-filter-albumBharat Mediratta
2012-12-14Automated update of .build_number to 261 for branch masterAutomatic Build Number Updater
2012-12-14Bugfix follow-on to a74e3aea6f0bdde210c91622535af3e58aa1e9fd - thanks to chil...Bharat Mediratta
2012-12-14fix, use $current->scoreChris Chilvers
2012-12-14search within the current album by defaultChris Chilvers
2012-12-10Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-12-10Automated update of .build_number to 260 for branch masterAutomatic Build Number Updater
2012-12-10bug fix: updated file_proxy.php to use legal_file helper instead of hard-code...shadlaws
2012-12-09Automated update of .build_number to 259 for branch masterAutomatic Build Number Updater
2012-12-09Eliminate the search context if we encounter an item that cannot beBharat Mediratta
2012-11-29Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-11-15Automated update of .build_number to 258 for branch masterAutomatic Build Number Updater
2012-11-15Merge pull request #75 from chalbertgit/masterBharat Mediratta
2012-11-13[#1907] Added code needed for the case when a user upgrades.chalbertgit
2012-11-13[#1907] Added administrative variable to set lock timeout.chalbertgit
2012-11-06Automated update of .build_number to 257 for branch masterAutomatic Build Number Updater
2012-11-06Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2012-11-06Elevate X-Frame-Options from all admin and user pages to all PHPBharat Mediratta
2012-11-01Automated update of .build_number to 256 for branch masterAutomatic Build Number Updater
2012-11-01Don't show the sidebar on error pages - it just increases the chancesBharat Mediratta
2012-10-25Fixed event sent from User_Controller::_get_change_email_formMichael A Mayer
2012-10-18Merge pull request #2 from gallery/masterMike Mayer
2012-10-16Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-10-08Automated update of .build_number to 255 for branch masterAutomatic Build Number Updater
2012-10-08Merge pull request #73 from epeay/masterBharat Mediratta
generated by cgit v1.2.3 (git 2.51.0) at 2025-12-24 13:30:32 +0000