Commit Graph

6074 Commits

Author SHA1 Message Date
Bharat Mediratta
77ec061663 Redirect to the root album when there's an empty path and empty id.
Fixes ticket #1387.
2010-09-18 15:12:43 -07:00
Bharat Mediratta
c65ce125cb Merge branch 'master' of github.com:gallery/gallery3 2010-09-18 14:33:04 -07:00
Bharat Mediratta
8ee25157ec Fix a bug in the way that we calculate expiration dates for old
comments by using Database_Expression.  Fixes ticket #1386.
2010-09-18 14:29:52 -07:00
Tim Almdal
38be33ef35 Merge branch 'master' into talmdal_dev 2010-09-17 17:48:20 -07:00
Tim Almdal
207d848989 Add some whitespace. 2010-09-17 17:47:12 -07:00
Bharat Mediratta
8135429430 Checkpoint. 2010-09-17 13:39:48 -07:00
Bharat Mediratta
3e1743b21f Add a module variable containing extra paths to search for binaries.
Fixes ticket #1384.
2010-09-16 20:43:48 -07:00
Bharat Mediratta
64dfccc4ed Preserve the image extension on the temp file that we create for
rotating images.  Some versions of GD won't work if we don't do this.
Fixes ticket #1375.
2010-09-16 20:04:22 -07:00
Bharat Mediratta
de2f9baeee Add a link to
http://codex.gallery2.org/Gallery3:Choosing_A_Graphics_Toolkit to help
users choose a graphics toolkit.  Fixes ticket #1372.
2010-09-16 19:34:42 -07:00
Bharat Mediratta
5e316f78c6 Restrict viewing user profile pages to registered users only, but
provide a "show_user_profiles_to" setting to allow admins to open it
up to everybody (choices there are "registered_users", "admin_users"
or "everybody").  Fixes ticket #1378.
2010-09-16 15:17:00 -07:00
Bharat Mediratta
3e3098956c Convert the guest_url ORM validation failure back to the url form
parameter and put in a message requiring a valid url.  Fixes ticket
2010-09-16 14:19:28 -07:00
Tim Almdal
a1e25313e3 Clean up white space 2010-09-15 20:12:05 -07:00
Tim Almdal
4251704175 Move the contents of lib/gallery.common.css into themes/wind/css/screen.php and themes/admin_wind/css/screen.php. Most themers seem to copy the contents into their theme's screen.css anyway. 2010-09-15 18:20:27 -07:00
Bharat Mediratta
70f15c6662 Add ability to sort albums by name. Fixes ticket #1377. 2010-09-14 19:51:43 -07:00
Bharat Mediratta
4b8d6beb5e Report the graphics toolkit in the platform block. 2010-09-14 19:40:54 -07:00
Bharat Mediratta
af24aa5abe The full_name field is required to be NOT NULL. Not really sure why
this is a hard requirement, but for now in User_Model::save() let's
use the empty string if the field itself is null.  Fixes ticket #1371.
2010-09-14 11:47:53 -07:00
Bharat Mediratta
1a0d76c43e When moving a single item, just copy its permissions from its parent
album.  This is totally legal since an items permissions must be the
same as its parent's, and it's much faster for large installs where
a complete recalculation can be very costly.  Should fix #1360.
2010-09-13 22:23:09 -07:00
Bharat Mediratta
19750cb0d5 When deleting items, choose the first *viewable* peer as the album
cover.  Normally, all items are equally viewable, but in our unit
tests we occasionally have the scenario where peers have different
viewability settings which is internally consistent although only
possible if you set the fields manually.
2010-09-13 22:02:19 -07:00
Bharat Mediratta
b08bf26d2d Ignore the private gallery settings if we're in the cli SAPI. It
breaks the upgrader.  Fixes #1361, thanks to Romain LE DISEZ.
2010-09-12 14:34:49 -07:00
Bharat Mediratta
a98841613a LOWER() the slug and name in the find_dupes functions since DISTINCT
is case sensitive, but our dupe validation is not.  Fixes ticket #1367.
2010-09-12 14:30:25 -07:00
Bharat Mediratta
19034d140e Rename the class to Item_Model_Core so that it can be overloaded.
Related to ticket #1368.
2010-09-12 13:35:50 -07:00
Bharat Mediratta
1ca2780efb Merge branch 'master' of github.com:gallery/gallery3 2010-09-12 12:58:49 -07:00
Bharat Mediratta
0b223d5484 Clean up cli default instructions. 2010-09-12 12:58:30 -07:00
Tim Almdal
bd532f6c88 Merge branch 'master' of git@github.com:gallery/gallery3 2010-09-12 10:57:41 -07:00
Tim Almdal
ac64614d4d Path for ticket #1140. Add a size0 to the tag cloud. 2010-09-12 10:53:06 -07:00
Bharat Mediratta
f84c4a6192 Uniqify the name and slug when we move an item to a new location with
a conflict.  This fixes #1364.
2010-09-11 23:37:12 -07:00
Bharat Mediratta
9f11d8ad83 Log the JSON response on errors so that we can figure out what's going
wrong.  This will help diagnose #1364 which appears to be an
ORM_Validation_Exception, except the actual output is getting eaten by
the Organize SWF so we can't see it without snooping network traffic.
2010-09-11 22:38:47 -07:00
Bharat Mediratta
cc4a54a3d6 Fix bug introduced in b6fa33faf7. Don't
try to use $(this).data("reload.location") if it hasn't been set,
which can happen if Flash isn't available.  Fixes #1362
2010-09-11 22:18:53 -07:00
Bharat Mediratta
b4fb11f8d5 Only call $theme->item() if we're in a non admin theme. 2010-09-11 21:40:57 -07:00
Bharat Mediratta
bfd92ac6f2 Use $theme->item() instead of $theme->item, otherwise
isset($theme->item) may return true even when we don't have an actual
Item_Model in there.
2010-09-11 21:38:46 -07:00
Bharat Mediratta
c9c4f96100 Tune timeouts to work better on large installs. 2010-09-11 21:36:38 -07:00
Bharat Mediratta
14ae1fde25 Use the actual csrf token, not the placeholder (url::site doesn't
replace that).  Fixes ticket #1361
2010-09-11 10:41:47 -07:00
Bharat Mediratta
cef7ca9cf2 Change tag url form to be /tag/{name} from /tags/show/{id}. This is
a much friendlier url format.  Fixes ticket #1363.
2010-09-11 10:26:48 -07:00
Bharat Mediratta
34a71e7cd3 Verified. 2010-09-11 01:48:44 -07:00
Bharat Mediratta
509b647c65 upgrader/index does not require CSRF 2010-09-11 01:48:26 -07:00
Bharat Mediratta
67f45cfa78 Add CSRF protection to the upgrader. And update the CLI output so
that it tells you which modules failed to upgrade properly.  Fixes
ticket #1359.
2010-09-11 01:46:45 -07:00
Bharat Mediratta
a88b3f5808 Implement IdentityProvider_Gallery_Driver::admin_user() properly such
that it's not hardcoded to return the user with id 2.  Create
user::admin_user() which finds an appropriate admin and returns it.
Fixes #1358.
2010-09-11 00:47:48 -07:00
Bharat Mediratta
81327641cd Fix two bugs with the context menu:
1) Prevent it from "bouncing" which happens when we queue up a lot of
   open and close events.  Stop any running animations before starting
   new ones.  This fixes #1340.

2) Prevent a bug that's not really visible to the user where we wind
   up re-initializing a context menu over and over which results in us
   binding tons of hover events.  I don't think this causes any serious
   damage, but it's probably not good.
2010-09-11 00:27:47 -07:00
Bharat Mediratta
b35886c0fc Refactor $.fn.gallery_context_menu() to store some variables instead
of using CSS selector lookups for every operation.  I assume (but have
not verified) that this is more efficient.
2010-09-11 00:08:38 -07:00
Bharat Mediratta
304dd9cb51 After replacing thumbnails, resize all .g-item boxes down to just a
bit larger than the image and then do equal_heights() on them.  This
tightens the grid back up again when appropriate after a rotation.
2010-09-10 23:13:47 -07:00
Bharat Mediratta
6640bd18ca Merge branch 'master' of github.com:gallery/gallery3 2010-09-10 23:09:52 -07:00
Bharat Mediratta
5892712b23 If the user is not an admin, don't 403 -- instead just redirect them
to the root album.  Fixes ticket #1356.
2010-09-10 23:01:47 -07:00
Bharat Mediratta
3936183446 Merge branch 'master' of github.com:gallery/gallery3 2010-09-10 08:41:12 -07:00
Bharat Mediratta
d698a19e0e Transfer deleted files to the active user. Or at least say that's what we're going to do, we actually transfer them to one of the admins 2010-09-10 08:40:30 -07:00
Bharat Mediratta
6e62d604a4 Resize the .g-item to contain the rotated image, and make all
.g-item's the same height and realign the photo vertically, both on
the .g-item and the hover placeholder.  Fixes ticket #1354.
2010-09-09 21:58:16 -07:00
Bharat Mediratta
4f058d2ac2 Merge branch 'master' of github.com:gallery/gallery3 2010-09-09 21:35:12 -07:00
Bharat Mediratta
6211ed69d7 Vertically realign thumbnails after rotation so that they stay
centered.  Partial fix for #1354.
2010-09-09 21:25:23 -07:00
Bharat Mediratta
32878ebfdc Replace the hook function hack I introduced in
cbba45fffc with a namespaced jQuery
custom event.  This is way more portable.
2010-09-09 21:04:18 -07:00
Tim Almdal
91d4ffa680 Change the color of the text in the close button to match the foreground color not the border color. 2010-09-09 20:36:18 -07:00
Bharat Mediratta
36f3a0387d Tighten up the "your gallery2 has xxx in it" info display. 2010-09-08 21:39:35 -07:00