Andy Staudacher
2c3c126aaf
Fix ticket 930: Use the first frame as video thumbnail if the video is shorter than 3 seconds. And fall back to the default thumbnail if that operation fails.
...
Thanks to lsowen for providing a patch!
2010-02-06 20:07:58 -08:00
Andy Staudacher
a6170dc065
Fix maintenance view for the case when g2_import is configured and the user replaced the original g2 directory with the .htaccess file only.
2010-02-06 18:37:25 -08:00
Andy Staudacher
163391ee39
Partial fix for ticket 585: Require current password when changing an account's email address.
...
Still leaving the user/group admin page wide open though.
2010-02-06 17:43:33 -08:00
Tim Almdal
6340d8caf2
100% was just to wide, so scale the width back to 90% for organize album tree branches.
2010-02-06 16:43:55 -08:00
Andy Staudacher
6a9c6163d6
Merge commit 'upstream/master'
2010-02-06 16:34:37 -08:00
Tim Almdal
81b595743f
Force each branch of a tree onto a new line.
2010-02-06 16:30:25 -08:00
Andy Staudacher
7232b6c026
Fixing G2 url mapping for G2 default style URLs (where ShowItem and DownloadItem URLs aren't rewritten in G2).
...
Note: For a perfect solution, we should add 2 map entries for each of G2's ShowItem and DownloadItem URLs, one for short and one for long style URLs.
E.g. A G2 installation might have been using short style URLs not for its complete lifetime. And long style URLs are supposed to work in G2 even when short style URLs are enabled (and its used that way in bbcode / as a way to get permenant, id based URLs from G2).
2010-02-06 16:29:51 -08:00
Tim Almdal
b0a73757d2
Merge branch 'master' of git@github.com:gallery/gallery3
2010-02-06 16:14:44 -08:00
Andy Staudacher
33b39efb49
Add core.DownloadItem redirect for G2's Photo and Movie items (was previously omitted, but we already had core.DownloadItem redirects for derivatives)
2010-02-06 15:46:13 -08:00
Andy Staudacher
d069155228
Fix g2 redirects for non-admins. The g2 URL mapping controller was accidentally declared as admin controller.
...
(The previous attempt to fix this isn't a bad change either, thus keeping the external permenant redirect).
2010-02-06 15:08:10 -08:00
Andy Staudacher
e092405fdf
Fix g2 redirect to use external redirect (and declare it as permanent).
...
Redirects weren't working for me in Firefox 3.5 when not signed into G3 (and all items are public).
2010-02-06 14:59:28 -08:00
Andy Staudacher
d8d1155615
Fix maintenance view, which was broken when the g2_import module was installed but not configured correctly.
2010-02-06 14:20:19 -08:00
Andy Staudacher
9bede5763a
Fix g2_import admin screen: It wouldn't work if it didn't know the location of G2 yet.
2010-02-06 13:15:02 -08:00
Andy Staudacher
7099fc71f1
Fix for ticket 1004: Replace all uses of split with explode (none actually required regular expressions). Thanks to Brian Hartsock for providing a patch!
2010-02-06 13:05:44 -08:00
Andy Staudacher
5c0c33782d
Fix for ticket 892: Avoid double escaping of HTML entities, instead use Unicode in the source code for the locale names (as we do in other places already).
...
Note: Also fixing the localized name of Ukrainian. For some reason it was garbled before.
2010-02-06 12:19:55 -08:00
Andy Staudacher
4977c00db1
Merge commit 'upstream/master'
2010-02-06 11:32:53 -08:00
Tim Almdal
0f9d23d074
Cleanup the position of the drop marker.
2010-02-06 10:36:29 -08:00
Tim Almdal
15e2207655
correct layout of html for readability
2010-02-06 10:12:53 -08:00
Tim Almdal
83f61ff5cf
Insure that the 'Ascending'/'Descending' string are translated on the organize dialog.
2010-02-06 09:47:56 -08:00
Bharat Mediratta
f631c2a0e5
Fix up Admin_Users_Controller() form handling now that user_form.html
...
is gone. Fixes ticket #1005 .
2010-02-06 09:30:45 -08:00
Tim Almdal
73527fba61
1) Manually added the .selectee class on subsequent downloads. fixes ticket #970
...
2) Reworked the calculated of the drop target marker to account for scrolling.
2010-02-05 23:38:06 -08:00
Tim Almdal
f5391b8424
Merge branch 'master' into talmdal_dev
2010-02-05 15:51:02 -08:00
Tim Almdal
64c37aed07
continuing cleaninup organize javascript especially the drag and drop functionality.
2010-02-05 14:38:24 -08:00
Tim Almdal
bc14f33ae1
Fix an issue where the dragged item was always inserted after the target image.
2010-02-05 11:15:28 -08:00
Tim Almdal
94cc061e8b
Correct alignment in IE7. fixes ticket #795
2010-02-05 10:25:55 -08:00
Tim Almdal
8518fb2674
Add busy animation when doing the drop.
2010-02-05 08:53:38 -08:00
Tim Almdal
a8d30dcecf
Improve the handling of the drop target marker when dragging items within the
...
grid. Originally the borders disappeared not they don't. A single element is
used to contain the drop target marker. This element contains all the position
information for the drop handler to determine where the item should be
positioned.
In addition, the drop target marker is removed when the drag extends outside
the grid and is re shown, when the cursor re-enters the thumbnail grid.
2010-02-05 08:08:12 -08:00
Tim Almdal
eff7de3852
If the locale is rtl then change 'after' to 'before' or vice-versa. Fixes ticket #939 .
2010-02-04 08:51:15 -08:00
Tim Almdal
3d2a3bee57
Provide better formating for the album tree in rtl mode.
2010-02-04 08:42:55 -08:00
Tim Almdal
c820613917
Don't change the current album when items are dragged to a different album in the album tree. Fixes ticket #959 .
2010-02-04 08:24:02 -08:00
Tim Almdal
48efd21556
Provide visual feedback when over tree branches.
2010-02-04 08:24:01 -08:00
Tim Almdal
95b26db82c
1) Simplify the layout of the organize dialog content.
...
2) Use CSS to layout the thmbnail grid to the full dialog size. Fixes ticker #848 .
3) Separate css that can be themed into organize_theme.css. This isolates the themed components into a separate file for easy of overriding by a theme.
2010-02-04 08:23:02 -08:00
Tim Almdal
aa4ed45473
Differentiate between selected and non selected items.
2010-02-04 07:46:41 -08:00
Tim Almdal
cc1d25ae0a
remove debugging statement
2010-02-04 07:46:10 -08:00
Tim Almdal
1f51d663a0
Correct missing function name.
2010-02-03 08:18:53 -08:00
Bharat Mediratta
99a7f470b9
Protect password changes against brute force attacks.
2010-02-02 21:48:01 -08:00
Bharat Mediratta
6e1b761b12
Require the current password to change your password.
...
Fixes ticket #585 .
Separate out the password change form from the regular edit user form.
Require the old password to enter a new one. While I'm at it, roll
the password strength javascript into a Form_Script element so that we
can get rid of the old view (which incidentally fixes a bug where the
password strength meter would go away on form errors).
2010-02-02 21:36:01 -08:00
Bharat Mediratta
b351ee48fe
Fix a bug in valid_password() where an empty password was considered valid.
2010-02-02 21:34:20 -08:00
Bharat Mediratta
225fe81ce0
Add an upgrade path to prevent the item title field from being empty.
2010-02-02 20:50:34 -08:00
Bharat Mediratta
08f3f71ad9
Merge branch 'master' of git@github.com:gallery/gallery3
2010-02-02 19:04:20 -08:00
Tim Almdal
9ac3eca477
Merge branch 'master' into talmdal_dev
2010-02-02 15:01:13 -08:00
Tim Almdal
1c0e5eaa0d
use html::purify to cleans the additional content on the admin maintence page.
2010-02-02 15:00:05 -08:00
Tim Almdal
f69493d138
Update the xss golden file to reflect the changes to the admin screen.
2010-02-02 14:51:06 -08:00
Tim Almdal
d5a231225d
Move the scheduler module to the -contrib repository for this release.
2010-02-02 14:37:26 -08:00
Tim Almdal
19fee6b5e4
Refactor the admin maintenance screen so that events are used to pupluate the action buttons and other content such as the list of scheduled tasks.
2010-02-02 14:34:50 -08:00
Andy Staudacher
31aaf7555f
Merge commit 'upstream/master'
2010-02-02 13:41:50 -08:00
Bharat Mediratta
aa65bb0048
Merge branch 'master' of git@github.com:gallery/gallery3
2010-02-02 13:08:27 -08:00
Tim Almdal
3c3671cff2
Remove the test-transform:uppercase from the l10n css as it was causing problems with other text fields in IE and it violates our case standards. Fixes ticket #912
2010-02-02 12:30:23 -08:00
Tim Almdal
fe11e34cea
Change the view to display 'empty' when the variable value is a null string(""). Fixes ticket #987 .
2010-02-02 11:42:13 -08:00
Tim Almdal
370faf5f26
Display the error message for the in place edit. Also improve the double click guard. Fixes ticket #1000 .
2010-02-02 10:55:22 -08:00
