Commit Graph

6348 Commits

Author SHA1 Message Date
Bharat Mediratta
167f635a6c Add arguments to random::int() to match mt_rand(). Follow on to cd48b89f31
for #1527.
2011-01-16 23:06:19 -08:00
Bharat Mediratta
70abfb2a20 Upgrade checking code is now here, along with a bump of the Gallery
module to v46.  There's a new block in the admin dashboard which
controls whether automatic checking happens, and lets you check
immediately.  If a newer version is detected, a site status message
appears for admins providing upgrade instructions.

Automatic checking is not yet implemented (even though the UI claims
that it exists).  This is all for #1605.
2011-01-16 22:16:09 -08:00
Bharat Mediratta
84d576606d Change the value column of the messages table from a varchar(255) to a
text.  Fixes #1612.
2011-01-16 21:46:03 -08:00
Bharat Mediratta
b78b109018 Fix indentation. 2011-01-16 17:10:30 -08:00
Bharat Mediratta
4f5aed5b55 Merge branch 'master' of github.com:gallery/gallery3 2011-01-16 17:03:47 -08:00
Bharat Mediratta
6849581448 Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
2011-01-16 17:01:03 -08:00
Bharat Mediratta
e22c2e64ba Arbitrarily set the build number for master to 50 2011-01-16 17:00:09 -08:00
Bharat Mediratta
ac44e9c930 First step in setting up version checking.
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-16 16:58:58 -08:00
Joe7
0020f87d6a Fixed paging for albums ordered by random.
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-16 16:58:58 -08:00
Bharat Mediratta
3e04535039 Merge branch 'Ticket#1610' of git://github.com/Joe7/gallery3 2011-01-16 14:16:26 -08:00
Bharat Mediratta
44da46abd4 Golden file updates for xss and controller authentication. 2011-01-15 15:11:37 -08:00
Bharat Mediratta
8583c1d259 Style fixes. 2011-01-15 15:10:27 -08:00
Bharat Mediratta
f0dd16efc4 Revive the code from Cache_Driver::exists and put it into a helper
function in the test so that we can keep our tests functioning.
Follow on to 66fd8c7518 for #1559.
2011-01-15 14:59:25 -08:00
Bharat Mediratta
02f30b91bf Follow on to 966dee8628 for #1586 --
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-15 14:20:26 -08:00
Bharat Mediratta
ee13b934f4 Fix all the head() and admin_head() theme callbacks to return the
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-15 13:14:43 -08:00
Bharat Mediratta
38b7493287 whitespace fix. 2011-01-15 13:07:14 -08:00
Joe7
375e3b1fa4 Fixed paging for albums ordered by random.
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-15 21:57:14 +01:00
Bharat Mediratta
376f09c4e1 Reorganize the url() function out from in the middle of the script/css combining functions. 2011-01-15 12:47:15 -08:00
Bharat Mediratta
d511fc77ad Tweake Joe's change to admin_users to revert the code that joins against the items
table; it's not clear that this is going to be efficient for large data sets.
2011-01-15 12:33:51 -08:00
Bharat Mediratta
a7d4f87bde Merge branch 'Ticket#1557' of git://github.com/Joe7/gallery3 2011-01-15 11:31:43 -08:00
Bharat Mediratta
e4a43c99e4 Mirror .htaccess PHP settings into php.ini for hosts that have
per-dir php.ini support configured, but don't use .htaccess.
Fixes #1603.
2011-01-11 21:41:20 -08:00
Bharat Mediratta
7eabf6c1c2 Use Math.round() instead of Number() to convert floating point numbers
to integer.  Fixes overflow probelm that causes #1490.  Thanks to
nkinkade for the fix.
2011-01-11 21:21:59 -08:00
Bharat Mediratta
09d34696a1 Update comments to annotate what data is where during the process.
Follow-on for #1518.
2011-01-11 17:54:33 -08:00
Bharat Mediratta
e3df9c1611 Merge branch 'Ticket#1518' of git://github.com/Joe7/gallery3 2011-01-11 17:53:16 -08:00
Bharat Mediratta
ee53744aa7 Two improvements to Joe's fix for #1504:
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-11 16:59:57 -08:00
Bharat Mediratta
f80b5959f1 Merge branch 'Ticket#1504' of git://github.com/Joe7/gallery3 2011-01-11 15:38:03 -08:00
Bharat Mediratta
92db7f4218 Update some comments. 2011-01-11 15:24:40 -08:00
Bharat Mediratta
252aba9eae Merge branch 'fix-viewable2_master' of git://github.com/BigMadWolf/gallery3 2011-01-11 15:17:05 -08:00
Joe7
049f2af1c9 Returning 2 flags from l10n_client::validate_api_key(), 1 to reflect if 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-12 00:05:11 +01:00
Joe7
7f6d87166d Removed check as input value is compared against dataset of validated values, and request is only processed further in case of a match. => this is unnecessary 2011-01-11 23:16:05 +01:00
Joe7
df802de6ae Making good use of Pagination class to reduce code (removed MY_Controller which duplicated some functionality available in Pagination as well) 2011-01-11 21:28:25 +01:00
Joe7
00b520fffd coding style 2011-01-11 20:53:48 +01:00
Bharat Mediratta
84e08a6283 Don't resize if the target size is the same as the original. Fixes #1602. 2011-01-11 01:04:10 -08:00
Bharat Mediratta
5ac49d497f Create new APIs for allowing themers to control what CSS/JS get
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-10 22:20:12 -08:00
Bharat Mediratta
9dfb733ad7 New albums should take the sort order from their parent. Fixes #1599. 2011-01-10 19:24:38 -08:00
Bharat Mediratta
23eaec7063 Stop using "which" to find binaries. Create system::find_binary()
which traverses the $PATH and returns any executable binary of the
appropriate name that it can find.  Fixes #1555.
2011-01-10 15:49:15 -08:00
Bharat Mediratta
d557b2a63e Allow File_Proxy_Controller to run in private gallery mode since it
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-10 14:50:30 -08:00
Bharat Mediratta
2826b70bec Use CSS not JS to determine the full size of the full size overlay. Fixes #1541. 2011-01-10 14:36:23 -08:00
Bharat Mediratta
bd6bd029a7 Fix up the version detecting regex for GraphicsMagick and don't crash
if the regex doesn't return properly.  Follow on to
3ec0ba956d for ticket #1595.
2011-01-10 14:04:15 -08:00
Bharat Mediratta
20ba7b6bee Merge branch 'graphics/detect_toolkits()_refactoring' of git://github.com/Joe7/gallery3 2011-01-10 13:54:20 -08:00
Bharat Mediratta
cdd09a8662 Merge branch 'Ticket#1593' of git://github.com/Joe7/gallery3 2011-01-10 11:46:12 -08:00
Bharat Mediratta
65ff2470a5 Use eeldivad's fallback code from http://gallery.menalto.com/node/96806#comment-358404
instead of relying solely on preg_quote.  Fixes #1460.
2011-01-09 22:36:20 -08:00
Bharat Mediratta
6544854863 Move the directory queue into the database as well, otherwise if you
have too many directories it blows out the task queue and the whole
thing falls over.  Fixes #1547.
2011-01-09 22:29:26 -08:00
Joe7
fca6d1254a Fixed offset sanitizing code - Fixes Ticket#1593 2011-01-09 18:48:24 -08:00
Bharat Mediratta
b7ffb0501e Replace preg_quote with a more targeted regex to fix the problem where
directories get skipped.  Fixes #1460, I think.
2011-01-09 18:38:09 -08:00
Joe7
97fc535411 Minor css mod to make it obvious paging belongs to user block 2011-01-09 21:19:55 +01:00
Joe7
89737c09d5 Paginator for user manager admin view
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-09 21:05:28 +01:00
Joe7
b2897b4922 Fixed offset sanitizing code - Fixes Ticket#1593 2011-01-09 14:20:30 +01:00
Jérémy Subtil
24c0b69847 Fixed item controllers so that any item position is computed correctly, when 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-09 12:14:46 +01:00
Jérémy Subtil
0d7e951aa5 Moved item_Model::get_position() method to the Item helper. It now calls the viewable() method on every query. 2011-01-09 12:14:46 +01:00