summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-12Changed this back to upstream version since now there is a user setting for ↵Nathan Kinkade
tag cloud size.
2011-05-12Manually merged a conflict after pulling from upstream.Nathan Kinkade
2011-05-08Automated update of .build_number to 152 for branch masterAutomatic Build Number Updater
Last update: 7c80e6ef84b460dcade80c4dd5a65b41b0523505 (1 commits ago)
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-06Automated update of .build_number to 151 for branch masterAutomatic Build Number Updater
Last update: 5d09cbff048fc2f457c8b19adb2177a12445890a (1 commits ago)
2011-05-06Merge pull request #52 from chadparry/tempnamBharat Mediratta
Fixes #1732
2011-05-05Automated update of .build_number to 150 for branch masterAutomatic Build Number Updater
Last update: 011eaa6480cbee8d328a31c9ac5c8e0ddc1f8a84 (1 commits ago)
2011-05-05Fix for ticket 1275. Do the same checking as Kohana uses and don't worry ↵Tim Almdal
about calling the utf8_encode routine. Corrected the error messages and also added a check to insure the XML Parser extension is loaded as we still need the utf8_encode function from it.
2011-05-05Automated update of .build_number to 149 for branch masterAutomatic Build Number Updater
Last update: 05ecfda36b7acee7f8d36df8391ba960097178a8 (1 commits ago)
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-02Automated update of .build_number to 148 for branch masterAutomatic Build Number Updater
Last update: 97400b78153620262120868b37545170416413c9 (2 commits ago)
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-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-30Automated update of .build_number to 147 for branch masterAutomatic Build Number Updater
Last update: c2f20c0c4a0337b45b2eb803170572b067e18dd9 (1 commits ago)
2011-04-30Differentiate between invalid, missing and broken G2 configs andBharat Mediratta
present the user with feedback in the form. Fixes #1727.
2011-04-28Automated update of .build_number to 146 for branch masterAutomatic Build Number Updater
Last update: 406064087662184ec7f85297b9cdf83a77976616 (1 commits ago)
2011-04-28Merged pull request #50 from mamouneyya/master.Chad Kieffer
As of ckieffer request
2011-04-28remove .rtl class from properties as they're now separated in a different ↵mamouneyya
file that is being called after screen.css. Also reset the left margin for list elements
2011-04-27Automated update of .build_number to 145 for branch masterAutomatic Build Number Updater
Last update: b57dd202db3c4b007e83aff3df9da7920691d76d (2 commits ago)
2011-04-27Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2011-04-26Automated update of .build_number to 144 for branch masterAutomatic Build Number Updater
Last update: 192cb124aa0f38ed804299bf39c15538cc768d7a (3 commits ago)
2011-04-26Merge branch 'master' of github.com:gallery/gallery3Chad Kieffer
2011-04-26Add right padding to list elements in the new g-text class.Chad Kieffer
2011-04-26Automated update of .build_number to 143 for branch masterAutomatic Build Number Updater
Last update: 192cb124aa0f38ed804299bf39c15538cc768d7a (1 commits ago)
2011-04-26Move wind and admin_wind RTL style definitions out to their own file. Call ↵Chad Kieffer
that file when an RTL language is selected.
2011-04-26Automated update of .build_number to 142 for branch masterAutomatic Build Number Updater
Last update: c6d1d6a6aed96f772690b74ac0be482bc2128a8d (5 commits ago)
2011-04-26Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
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-26Include jquery.scrollTo.js. Fixes #1720.Bharat Mediratta
2011-04-26Hide the paginator when there are no children. #1721.Bharat Mediratta
2011-04-26Automated update of .build_number to 141 for branch masterAutomatic Build Number Updater
Last update: c6d1d6a6aed96f772690b74ac0be482bc2128a8d (1 commits ago)
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-25Automated update of .build_number to 140 for branch masterAutomatic Build Number Updater
Last update: 10f117238a4302092fdfb71a02542281f2b2d356 (10 commits ago)
2011-04-25Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
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-25Automated update of .build_number to 139 for branch masterAutomatic Build Number Updater
Last update: 10f117238a4302092fdfb71a02542281f2b2d356 (8 commits ago)
2011-04-25Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
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-25Automated update of .build_number to 138 for branch masterAutomatic Build Number Updater
Last update: 10f117238a4302092fdfb71a02542281f2b2d356 (6 commits ago)
2011-04-25Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-04-25Update test golden files.Bharat Mediratta
2011-04-25Add appropriate preamble. #1696, #1698Bharat Mediratta
2011-04-24Automated update of .build_number to 137 for branch masterAutomatic Build Number Updater
Last update: 10f117238a4302092fdfb71a02542281f2b2d356 (3 commits ago)
2011-04-24Merge branch 'master' of github.com:gallery/gallery3Bharat 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.