summaryrefslogtreecommitdiff
path: root/modules
AgeCommit message (Collapse)Author
2011-05-18Initialize legal file arrays correctly.Chad Parry
2011-05-18Correction for the merge conflict markers I accidentally committed.Chad Parry
2011-05-18Expand the legal_file events to include separate photo and movie events, and ↵Chad Parry
to support MIME types.
2011-05-18Merge branch 'master' of https://github.com/gallery/gallery3 into rawphotoChad Parry
Conflicts: modules/gallery/helpers/system.php modules/gallery/tests/System_Helper_Test.php
2011-05-08Add the item id to the print_proxy line so that we have a little more infoBharat Mediratta
about what the original was, and extend the timeout to 90 days from 10. Fixes #1733.
2011-05-06Merge pull request #52 from chadparry/tempnamBharat Mediratta
Fixes #1732
2011-05-05Follow-on to 6f916e49d5b431c2c1961a13d1a61fef8c02d628 -- don't makeBharat Mediratta
database calls if Gallery isn't installed, else we fail to bounce the user to the installer on fresh packages. #1637.
2011-05-04Remove a newline I accidentally introduced.Chad Parry
2011-05-04Merge branch 'master' into tempnamChad Parry
2011-05-04Simplified the temp_filename implementation and removed the mocks.Chad Parry
2011-05-04Avoid "self::" because Kohana can't override it.Chad Parry
2011-05-02Track and redirect core.DownloadItem requests properly. This canBharat Mediratta
happen if the G2 was imported with rewrite on, so the g2_url in the g2_map table has a shortened url, but then rewrite is disabled and the .htaccess mod_rewrite rules are sending over a &g2_view=core.DownloadItem request. Fixes #1728.
2011-05-02Map the G2 album highlight thumbnail derivative id to the G3 album'sBharat Mediratta
thumbnail. Fixes #1729.
2011-04-30Merge branch 'master' of https://github.com/gallery/gallery3 into rawphotoChad Parry
2011-04-30Explain the conditional rename in item::save() with a comment.Chad Parry
2011-04-30Improve the comment explaining why the data_file extension is important.Chad Parry
2011-04-30The data_file field is public, so we don't need to supply an accessor method.Chad Parry
2011-04-30Change the signature of system::tempnam to something more appropriate for ↵Chad Parry
Gallery.
2011-04-30Create a tempnam substitute that safely creates files with a given extension.Chad Parry
2011-04-30Differentiate between invalid, missing and broken G2 configs andBharat Mediratta
present the user with feedback in the form. Fixes #1727.
2011-04-30Change the signature of system::tempnam to something more appropriate for ↵Chad Parry
Gallery.
2011-04-30Change the name of the extensions helper to legal_file.Chad Parry
2011-04-30Change the name of the extensions helper to legal_file.Chad Parry
2011-04-27Remove a newline at the end of the file that I accidentally introduced.Chad Parry
2011-04-27Merge branch 'master' of https://github.com/gallery/gallery3 into rawphotoChad Parry
2011-04-27Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2011-04-27Move the extensions helpers out of the Kohana system directory and into ↵Chad Parry
their own Gallery Extensions class.
2011-04-26Overhaul the Admin > Content > Comments page. Use a tabbed interfaceBharat Mediratta
for consistency with other parts of the admin UI (ie: G2 import). The UI is now Ajax driven because that's how jQuery tabs works best in this case. This requires a little finagling in JS to get the paginator links to load properly. While I'm in there, add a paginator at the top of the table, make the buttons in the delete tab sane and smooth scroll back to the top of the tab when switching pages. Fixes #1702
2011-04-26Stop using Pagination() and instead use $theme->pager() in views.Bharat Mediratta
Move the pager() function up to Gallery_View and replace themes/admin_wind/views/pager.html.php (Pagination based) with a modified version from the wind theme in themes/admin_wind/views/paginator.html.php. Fixes #1718.
2011-04-25Move random::string() to be test::random_string() and have it return aBharat Mediratta
random string of any length. Also introduce test::lorem_ipsum() and use that in places where we want strings of words. Fixes #1713.
2011-04-25Fix a bug introduced in 526859d9605d137ebe053ecbd80f46ca6a331194 whereBharat Mediratta
we changed the behavior of the slug code and included the file extension, not just the name. This broke Item_Model_Test::move_photo_with_conflicting_target_gets_uniqified_test so yay for unit tests! #1668
2011-04-25Update test golden files.Bharat Mediratta
2011-04-25Add appropriate preamble. #1696, #1698Bharat Mediratta
2011-04-24Show the tabs after the page has loaded to prevent Firefox from rendering theBharat Mediratta
unstyled page and then flashing. Fixes #1705.
2011-04-24Merge branch 'master' of git://github.com/ckieffer/gallery3Bharat Mediratta
2011-04-24Look for and return embed.php files in the autocomplete list if we canBharat Mediratta
find them. Fixes #1708.
2011-04-24Refactor the meat of g2_import::import_album() off into a separateBharat Mediratta
function so taht we can call it on the root album as well. Fixes
2011-04-24Ignore the presort when transferring over sort orders. Fixes #1710.Bharat Mediratta
2011-04-24Merge branch 'master' of git://github.com/gallery/gallery3Chad Kieffer
2011-04-24Fix a bug introduced in f2477703faa7cd05ff1aa16da3ecef7b666bef40 whichBharat Mediratta
was a fix for #1581 that caused us to skip adding highlights for any albums that had no sub-albums.
2011-04-24Don't put the Admin > Theme Options Save button in a fieldset.Chad Kieffer
2011-04-24Revert my two "fixes" on top of Andy's tag combine change. Leave ↵Bharat Mediratta
Tag_Model::items() calling Item_Model::viewable() because it's too dangerous to separate that out, and it's fragile to rely on only admins doing tag combines. Revert "Undo the change made in 5ce85636329b14673718836b3631a3e46efdc3bb because it messes up tag counts" - This reverts commit 67d2e8081c6e5f0b679881bca3fdc81fe1e78ccc. Revert "Move the calculation for item_related_update ahead of the duplicate" - This reverts commit 5ce85636329b14673718836b3631a3e46efdc3bb.
2011-04-24Merge branch 'master' of git://github.com/gallery/gallery3Chad Kieffer
2011-04-24Third times the charm. Rethink unordered lists and bullets. Revert to ↵Chad Kieffer
turning them off by default and provide a new class, g-text, to define a list or a section of text as needing to display bullets.
2011-04-24Sentence-case the url. Fixes #1706.Bharat Mediratta
2011-04-24Merge branch 'master' of https://github.com/gallery/gallery3 into rawphotoChad Parry
2011-04-24For ticket #1701. Remove unused variable.Tim Almdal
2011-04-24Expose the data file field.Chad Parry
2011-04-24Clarify the meaning of variable names.Tim Almdal
2011-04-24Don't assign to the item->name field if the name is unchanged, because the ↵Chad Parry
save method will crash.