summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-30 #1973 Handle redirected G2 URLs for tags, including g2_itemId passedMike Miller
2013-01-23Automated update of .build_number to 280 for branch masterAutomatic Build Number Updater
Last update: b1fd5c9c8538d7179c287404a2161b0c0eaf14c8 (1 commits ago)
2013-01-23Use the thumb proportion from the first item in an album if the album has ↵Bharat Mediratta
children. Fixes #1958.
2013-01-23Automated update of .build_number to 279 for branch masterAutomatic Build Number Updater
Last update: 9b75a4e9260e20f1679c28ba8ffe9647e8912122 (3 commits ago)
2013-01-22Merge pull request #98 from shadlaws/fix_1954Bharat Mediratta
#1954 - Skip buffer calls for unit tests of file_proxy and data_rest.
2013-01-22gallery.menalto.com -> galleryproject.orgBharat Mediratta
codex.gallery2.org -> codex.galleryproject.org Fixes #1957.
2013-01-21#1954 - Skip buffer calls for unit tests of file_proxy and data_rest.shadlaws
Moved the "if (TEST_MODE)" statement before the buffer calls in file_proxy and data_rest. This has no impact on normal use, but will make the unit tests more compatible with different server/PHP configurations. Note: We do not have to skip setting the headers, which means we can build unit tests around them if we wish.
2013-01-21Update copyright to 2013. Fixes #1953.Bharat Mediratta
2013-01-20Automated update of .build_number to 278 for branch masterAutomatic Build Number Updater
Last update: 49ebef7f0005f429f7bea8e9c307a140035b4a05 (1 commits ago)
2013-01-20Merge pull request #95 from shadlaws/fix_1950Bharat Mediratta
#1950 - Replace bogus file overwrites from item model unit test.
2013-01-20Automated update of .build_number to 277 for branch masterAutomatic Build Number Updater
Last update: 2353c92c1adf42763bede046caaa6abbfba834d8 (3 commits ago)
2013-01-21Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-21Add unit tests for data_rest. While I'm in there, get rid of theBharat Mediratta
clause that returns nothing when the album has no album cover - we'll fail before that if the album's thumbnail is missing, and if it's not missing then we'll have something to serve even if it's out of date.
2013-01-20Automated update of .build_number to 276 for branch masterAutomatic Build Number Updater
Last update: 2353c92c1adf42763bede046caaa6abbfba834d8 (1 commits ago)
2013-01-20Add a long overdue test for File_Proxy_Controller that tests all the variousBharat Mediratta
edge case behaviors. It doesn't cover the various headers, but it does cover the permission based code paths.
2013-01-20#1950 - Replace bogus file overwrites from item model unit test.shadlaws
- modified rename_photo_test, rename_album_test, move_album_test, move_photo_test - unit tests still test file system integrity and pass
2013-01-20Automated update of .build_number to 275 for branch masterAutomatic Build Number Updater
Last update: dc3f2f637e720dd456a406859417ccb39184bedc (1 commits ago)
2013-01-19Merge pull request #94 from shadlaws/fix_1949Bharat Mediratta
#1949 - Fix album thumb mime types given by data_rest and file_proxy
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