Commit Graph
5668 Commits
Author SHA1 Message Date
Chad Kieffer 1e56e683fc Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-09 21:36:37 -06:00
Tim Almdal 16ef912154 Merge branch 'master' of git://github.com/gallery/gallery3 2009-06-09 20:35:37 -07:00
Bharat Mediratta f55686c7ef Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-09 20:33:31 -07:00
Chad Kieffer 89b6570ecc Update floats after .rtl addition. Both should work now. 2009-06-09 21:33:16 -06:00
Bharat Mediratta a20246b738 Say hello to the new upgrader UI. 2009-06-09 20:33:06 -07:00
Bharat Mediratta 00b528afac Cache the available module list in module::$available. 2009-06-09 20:32:37 -07:00
Andy Staudacher 7e4fcb97cb Fix HTML bug in l10n message 2009-06-09 20:10:34 -07:00
Bharat Mediratta 5e6c8894e2 Use a reference in available() to avoid crappy looking dereferencing. 2009-06-09 20:08:48 -07:00
Andy Staudacher 86a32d412f Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-09 19:49:58 -07:00
Andy Staudacher 7ccb65ea9e Fix for fetching l10n plural messages. Need to cast from stdclass to array(), as I18n expects all messages to be either string or array. 2009-06-09 19:49:06 -07:00
Tim Almdal ec0890e42b Merge branch 'master' of git://github.com/gallery/gallery3 2009-06-09 19:47:12 -07:00
Bharat Mediratta 798444f40b Replace login_page.html.php with the form, wrapped in our default page
type.
2009-06-09 19:45:15 -07:00
Tim Almdal d0a9d39c6a Merge branch 'master' of git://github.com/gallery/gallery3 2009-06-09 19:34:52 -07:00
Bharat Mediratta e5d273e929 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-09 19:00:22 -07:00
Bharat Mediratta d0b2544511 Check in /usr/local/bin for ffmpeg, and create the setting even if its
empty (to make it easier for folks to change it in Admin > Settings >
Advanced)
2009-06-09 18:59:53 -07:00
Bharat Mediratta 79d526f1fa Put in a placeholder link to click on if there's no value for a setting. 2009-06-09 18:58:40 -07:00
Tim Almdal b276eaa68b Add some window dressing to login_page.html in order to make it more in line
with the overall look of the Gallery3 theme

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 08:39:47 +08:00
Tim Almdal 98422857eb Forgot this on the last commit
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 08:39:46 +08:00
Tim Almdal a4a38ba760 Created not_authorized.html.php which is a prettier login screen if the root
album is not publicly browsable.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 08:39:45 +08:00
Tim Almdal 7e61bcbbec Add some window dressing to login_page.html in order to make it more in line
with the overall look of the Gallery3 theme
2009-06-09 17:38:21 -07:00
Tim Almdal cf86a7b8df Forgot this on the last commit 2009-06-09 17:22:35 -07:00
Tim Almdal e7a3b6fa55 Created not_authorized.html.php which is a prettier login screen if the root
album is not publicly browsable.
2009-06-09 17:17:27 -07:00
Tim Almdal 70546cdbda Merge branch 'master' of git://github.com/gallery/gallery3 2009-06-09 16:27:45 -07:00
Tim Almdal b11ec14f24 Changed how directories are processed when the parent directory is selected and
the branch was never opened on the client.  This should fix some of the issues
with the server_add as I was able to select the staging directory and then add
over 400 images in a multi-tier structure.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 07:23:30 +08:00
Tim Almdal 08d8d32046 Changed how directories are processed when the parent directory is selected and
the branch was never opened on the client.  This should fix some of the issues
with the server_add as I was able to select the staging directory and then add
over 400 images in a multi-tier structure.
2009-06-09 16:18:47 -07:00
Bharat Mediratta 90244e1705 fix typo: "the the" -> "the" 2009-06-09 13:25:11 -07:00
Tim Almdal 65e73f181b Merge branch 'master' of git://github.com/gallery/gallery3 2009-06-09 13:18:32 -07:00
Tim Almdal 3c3a65b5a7 Rather than just displaying the "unformatted" login screen when the root album
is not viewable by a guest, display the root album as if it was empty. When
the page finishes loading force the login dialog to be displayed.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 22:22:57 +08:00
Tim Almdal b84ef45eb1 Rather than just displaying the "unformatted" login screen when the root album
is not viewable by a guest, display the root album as if it was empty. When
the page finishes loading force the login dialog to be displayed.
2009-06-09 07:18:41 -07:00
dkm 2fa9f295ea Merge branch 'master' of www.kataplop.net:/var/www/gallery3-marc 2009-06-09 16:17:22 +02:00
Marc 657e17361d fix previous commit 2009-06-09 16:16:18 +02:00
Tim Almdal 8189c1fc6b Removed extra whitespace
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 21:45:57 +08:00
Tim Almdal f0ea6d532c Create a new method in MY_url.php "get_item_from_uri" which loads the item
based on the uri.  Then use this helper method in logout.php to insure that
the guest user has access to the "continue" uri.  If they don't redirect to
the root album and let it deal with access issues.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 21:45:43 +08:00
Tim Almdal 01042b6d85 Removed extra whitespace 2009-06-09 06:44:08 -07:00
Tim Almdal 3b125c0cc0 Merge branch 'master' of git@github.com:talmdal/gallery3 2009-06-09 06:40:11 -07:00
Chad KiefferandTim Almdal 2f2fdb1a8f Show status message when album cover is set (#257)
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 21:37:58 +08:00
Tim Almdal 1fc7904656 Create a new method in MY_url.php "get_item_from_uri" which loads the item
based on the uri.  Then use this helper method in logout.php to insure that
the guest user has access to the "continue" uri.  If they don't redirect to
the root album and let it deal with access issues.
2009-06-09 06:35:35 -07:00
dkm 93acc00959 Merge branch 'master' of git@github.com:dkm/gallery3 2009-06-09 13:40:40 +02:00
Marc e77ba1d751 fix gallery2 import with multisite config 2009-06-09 13:36:36 +02:00
Chad Kieffer a42c101c0b Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-09 00:26:01 -06:00
Chad Kieffer d2b8ca241d Show status message when album cover is set (#257) 2009-06-09 00:25:49 -06:00
Bharat MedirattaandTim Almdal cb7e375f6c Try again to properly detect the base url, taking into account the
sites that mangle SCRIPT_NAME

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 14:17:30 +08:00
Bharat MedirattaandTim Almdal 56f00333cd Fix the admin/themes url.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 14:17:30 +08:00
Bharat Mediratta f7a720d2e8 Rename main_element_attributes() callback to body_attributes() to be
more intuitive for themers.
2009-06-08 23:17:28 -07:00
Bharat MedirattaandTim Almdal bb844c1139 Improve error handling support for corrupt images and report them
appropriately in g2_import.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 14:17:26 +08:00
unostarandBharat Mediratta e6768a4e97 Add string to localizer
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-06-09 14:11:32 +08:00
Bharat Mediratta 6bae25d1f3 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-08 23:04:11 -07:00
Bharat Mediratta 47810c9aec Try again to properly detect the base url, taking into account the
sites that mangle SCRIPT_NAME
2009-06-08 23:02:16 -07:00
Chad Kieffer a3344814d7 Keep status messages. Users click away and may miss them, especially with tasks which take longer to complete. 2009-06-08 23:19:09 -06:00
Bharat Mediratta 1ecdb5ef0c Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-08 21:32:03 -07:00