summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-01-16Change the value column of the messages table from a varchar(255) to aBharat Mediratta
text. Fixes #1612.
2011-01-16Fix indentation.Bharat Mediratta
2011-01-16Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2011-01-16Specify that we don't want the BUILD_NUMBER changes that happen in other ↵Bharat Mediratta
branches by using a custom merge-keep-ours merge algorithm.
2011-01-16Arbitrarily set the build number for master to 50Bharat Mediratta
2011-01-16First step in setting up version checking.Bharat Mediratta
We now have two types of packages (release, git). Instead of using constants, we now have gallery::version_string() which returns the current version string. If you're on a release package, then the version string looks like: 3.0 (Santa Fe) If you're on a git package, then the version string looks like this: 3.0.1 (branch 3.0.x build 3) We track the build number in a new file in the gallery3 root called BUILD_NUMBER which we will update periodically with the latest build number for each branch.
2011-01-16Fixed paging for albums ordered by random.Joe7
MySql has problems when comparing float values against -seemingly same- float input, see http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html for details. Fixes #1610
2011-01-16Merge branch 'Ticket#1610' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-15Golden file updates for xss and controller authentication.Bharat Mediratta
2011-01-15Style fixes.Bharat Mediratta
2011-01-15Revive the code from Cache_Driver::exists and put it into a helperBharat Mediratta
function in the test so that we can keep our tests functioning. Follow on to 66fd8c7518ab71466aca72d20fb7bcd5f374af26 for #1559.
2011-01-15Follow on to 966dee8628293f78fbf9431281709ceba011d3c2 for #1586 --Bharat Mediratta
don't try to update the tag item count if we didn't change any items with this change (ie: a tag rename). In that case, we haven't loaded the related items so we don't have any idea what the count is going to be.
2011-01-15Fix all the head() and admin_head() theme callbacks to return theBharat Mediratta
results of the $theme->css() and $theme->script() calls. This handles the case where combining scripts/css returns HTML instead of putting it in the queue for combination. Fixes #1611.
2011-01-15whitespace fix.Bharat Mediratta
2011-01-15Fixed paging for albums ordered by random.Joe7
MySql has problems when comparing float values against -seemingly same- float input, see http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html for details. Fixes #1610
2011-01-15Reorganize the url() function out from in the middle of the script/css ↵Bharat Mediratta
combining functions.
2011-01-15Tweake Joe's change to admin_users to revert the code that joins against the ↵Bharat Mediratta
items table; it's not clear that this is going to be efficient for large data sets.
2011-01-15Merge branch 'Ticket#1557' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-11Mirror .htaccess PHP settings into php.ini for hosts that haveBharat Mediratta
per-dir php.ini support configured, but don't use .htaccess. Fixes #1603.
2011-01-11Use Math.round() instead of Number() to convert floating point numbersBharat Mediratta
to integer. Fixes overflow probelm that causes #1490. Thanks to nkinkade for the fix.
2011-01-11Update comments to annotate what data is where during the process.Bharat Mediratta
Follow-on for #1518.
2011-01-11Merge branch 'Ticket#1518' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-11Two improvements to Joe's fix for #1504:Bharat Mediratta
1) Trap all exceptions, eg dns or connectivity issues and report back in the form (but put the stack trace in the logs) 2) Rename "noconn" to "no_connection"
2011-01-11Merge branch 'Ticket#1504' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-11Update some comments.Bharat Mediratta
2011-01-11Merge branch 'fix-viewable2_master' of git://github.com/BigMadWolf/gallery3Bharat Mediratta
2011-01-12Returning 2 flags from l10n_client::validate_api_key(), 1 to reflect if ↵Joe7
connection was built up properly (just a boolean, not distuingishing between reasons in case of a failure), the other to reflect API validating success status. Using this presenting a slightly more meaningfull error msg to user in case the connection would fail. Fixes Ticket #1504
2011-01-11Removed check as input value is compared against dataset of validated ↵Joe7
values, and request is only processed further in case of a match. => this is unnecessary
2011-01-11Making good use of Pagination class to reduce code (removed MY_Controller ↵Joe7
which duplicated some functionality available in Pagination as well)
2011-01-11coding styleJoe7
2011-01-11Don't resize if the target size is the same as the original. Fixes #1602.Bharat Mediratta
2011-01-10Create new APIs for allowing themers to control what CSS/JS getBharat Mediratta
combined and when. Backwards compatible in that old themes will work, but their CSS/JS will no longer be combined unless they make some changes. Fixes #1600.
2011-01-10New albums should take the sort order from their parent. Fixes #1599.Bharat Mediratta
2011-01-10Stop using "which" to find binaries. Create system::find_binary()Bharat Mediratta
which traverses the $PATH and returns any executable binary of the appropriate name that it can find. Fixes #1555.
2011-01-10Allow File_Proxy_Controller to run in private gallery mode since itBharat Mediratta
does all the right permission checks. This prevents a hotlink to a private photo in a private gallery from kicking the user out to a login page. Fixes #1594.
2011-01-10Use CSS not JS to determine the full size of the full size overlay. Fixes ↵Bharat Mediratta
#1541.
2011-01-10Fix up the version detecting regex for GraphicsMagick and don't crashBharat Mediratta
if the regex doesn't return properly. Follow on to 3ec0ba956dced01a97f2ee7bd943d326c42350e3 for ticket #1595.
2011-01-10Merge branch 'graphics/detect_toolkits()_refactoring' of ↵Bharat Mediratta
git://github.com/Joe7/gallery3
2011-01-10Merge branch 'Ticket#1593' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-09Use eeldivad's fallback code from ↵Bharat Mediratta
http://gallery.menalto.com/node/96806#comment-358404 instead of relying solely on preg_quote. Fixes #1460.
2011-01-09Move the directory queue into the database as well, otherwise if youBharat Mediratta
have too many directories it blows out the task queue and the whole thing falls over. Fixes #1547.
2011-01-09Fixed offset sanitizing code - Fixes Ticket#1593Joe7
2011-01-09Replace preg_quote with a more targeted regex to fix the problem whereBharat Mediratta
directories get skipped. Fixes #1460, I think.
2011-01-09Minor css mod to make it obvious paging belongs to user blockJoe7
2011-01-09Paginator for user manager admin viewJoe7
Closes ticket #1557 Note: also optimizes the way item count is retrieved for users, saving <user_count>-1 queries when displaying this page
2011-01-09Merge remote branch 'upstream/master'colings
2011-01-09Fixed offset sanitizing code - Fixes Ticket#1593Joe7
2011-01-09Fixed item controllers so that any item position is computed correctly, when ↵Jérémy Subtil
some other items belonging to the same parent album are not viewable. Changed depracated calls to item_Model::get_position() to item::get_position().
2011-01-09Moved item_Model::get_position() method to the Item helper. It now calls ↵Jérémy Subtil
the viewable() method on every query.
2011-01-09Add an icon for the delete button so that it stands out a little bit more,Bharat Mediratta
and disable the button when nothing is selected. Fixes #1592.