Commit Graph
4149 Commits
Author SHA1 Message Date
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 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 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
Joe7andBharat Mediratta 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
Bharat Mediratta de5b06ae74 Add an icon for the delete button so that it stands out a little bit more,
and disable the button when nothing is selected. Fixes #1592.
2011-01-09 02:19:59 -08:00
Bharat Mediratta fc2733a2d1 Rename delete_items() to delete_selected_items(). 2011-01-09 00:16:40 -08:00
Bharat Mediratta a495419b91 Center the image inside the outer thumb div. 2011-01-09 00:00:16 -08:00
Beckett Madden-Woods 1a1a05ed94 Merge commit 'upstream/master' 2011-01-09 04:03:31 +00:00
Beckett Madden-Woods b78a1319ae Add item delete support to the organize module. Fixes #1588. 2011-01-09 03:59:25 +00:00
Bharat Mediratta 4c80ed53d2 Put up a more visually pleasing placeholder for items that are
missing a thumbnail.  Fixes #1591.
2011-01-08 19:27:08 -08:00
Bharat Mediratta d0df4896b0 Specify a width for the sort order dropdowns so that they don't
get squeezed on smaller screens.
2011-01-08 18:49:07 -08:00
Bharat Mediratta 8f5a3fd0c2 Update the dialog title to reflect the album we're currently
organizing.
2011-01-08 18:45:10 -08:00
Bharat Mediratta 249ca99c69 Updated with new bundle that has Ext.Msg in it. 2011-01-08 18:21:07 -08:00
Bharat Mediratta 713bd4eb6a Improve gallery::find_file() to do a better job of detecting the modules/themes directories.
Fixes #1590.
2011-01-08 18:10:43 -08:00
Bharat Mediratta e8bbf53708 Merge branch 'Ticket#1577' of git://github.com/Joe7/gallery3 2011-01-08 17:09:32 -08:00
Joe7 eecb244291 Made t() calls parsable by localization scanner 2011-01-09 02:06:35 +01:00
Bharat Mediratta 92f66058d3 Revert "Warn admins after login if their PHP install has the"
This reverts commit 612ddd7050.
2011-01-08 16:58:52 -08:00
Bharat Mediratta e1e1e860cd Use the code version when installing a module that has no installer,
instead of hardcoding version 1.  Fixes #1589.
2011-01-08 16:51:25 -08:00
Bharat Mediratta 4fc5d50eb8 Bump the organize module to version 3 and get rid of the code that
makes sure that it depends on the REST module.
2011-01-08 12:59:12 -08:00
Joe7 7dd63630d8 Minor coding style fix 2011-01-08 19:44:46 +01:00
Joe7 3ec0ba956d Refactored graphics::detect_toolkits() so ImageMagick and GraphicsMagick shares the same loop. Just as premarked as todo.
Will make https://sourceforge.net/apps/trac/gallery/ticket/1555#comment:3 an even quicker task
2011-01-08 19:39:23 +01:00
Joe7 5e8d92552b Temporarily removed ref tag to get the page validated. (Was also pointing at a rather semi-finished looking page) 2011-01-08 18:44:43 +01:00
Bharat Mediratta 7b382b363d Use the appropriate protocol for the reCAPTCHA script (so use https when the page is https).
Fixes #1445.
2011-01-08 00:19:57 -08:00
Bharat Mediratta 966dee8628 Move tag count management into the model. Fixes #1586. 2011-01-07 23:38:08 -08:00
Bharat Mediratta 7bbbe307ac Merge branch 'Ticket#1154' of git://github.com/Joe7/gallery3 2011-01-07 21:44:03 -08:00
Joe7 07acd2b750 Set video player to keep the aspect ratio of the video when playing in fullscreen
Fixes ticket #1154 - credit goes to floridave
2011-01-08 06:09:44 +01:00
Bharat Mediratta d17ba036ee Don't enable the REST module by default (fixes #1585).
Bump the info module per changes for #662.
2011-01-07 20:44:45 -08:00
Bharat Mediratta e1e2d9448f Merge branch 'master' into organize_dev 2011-01-07 20:29:06 -08:00
Bharat Mediratta edcb3b6656 Make the CSS for the organize menu consistently g-organize-link. Fixes #1070. 2011-01-07 20:23:49 -08:00
Bharat Mediratta 85ae320288 Keep Item_Model::scale_dimensions from upscaling. Fixes #1579. 2011-01-07 20:18:24 -08:00
Bharat Mediratta 4756db435c Minor style cleanup 2011-01-07 20:09:27 -08:00
Bharat Mediratta e4c6662dae Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-01-07 20:03:26 -08:00
Joe7 e86e8b8bd1 Added missing spaces (manual merging from 0d36b97aca3b5ed53ea3ea398ce28b0f6198e577) 2011-01-07 17:53:37 +01:00
Joe7 5bfb7fb96a Added batch importer for groups
Added missing ordering for comments and tags retrieving queries
(One might gets the same output without ordering especially if column is the primary key, but the only way to go for sure it by setting it)
2011-01-07 17:52:12 +01:00
Joe7 c338d3138e Importing Gallery2 users in batches
Fixes Ticket #1554
2011-01-07 17:51:21 +01:00
Joe7 f2477703fa Fix against ticket #1581 - based on https://github.com/Joe7/gallery3/commit/0d36b97aca3b5ed53ea3ea398ce28b0f6198e577 2011-01-07 17:33:37 +01:00
Bharat Mediratta 89597e7e70 Add a spinner to the dialog when loading the iframe so that it's not
just a blank dialog.  Create separate CSS for dialog vs. frame.
Don't show the Loading message for the first load.
2011-01-06 23:43:26 -08:00
Bharat Mediratta 24b8e9b060 Make the sort column combobox wider. 2011-01-06 23:15:07 -08:00
Bharat Mediratta 8ece1e3a19 Create a custom bundle of ExtJS for organize. It's 18% smaller, but
still pretty large.
2011-01-06 23:10:42 -08:00
Bharat Mediratta 0c9dbc9663 Adjust CSS for IE compatibility while keeping the grid tight on non-IE. 2011-01-06 21:40:16 -08:00
Chad Kieffer 06d94065ce Updates per Bharat's pull request review. Renamed info_block_metadata event to info_block_get_metadata. 2011-01-06 21:03:19 -07:00
Chad Kieffer a897a9d53f Also missed commiting this in a1e3b1ed17. 2011-01-06 21:00:28 -07:00
Chad Kieffer 740a6531fc Missed this commiting this in a1e3b1ed17. 2011-01-06 20:57:56 -07:00
Bharat Mediratta 600e04b58c Lock the drag zone if the album is not editable so that users don't
start illegal drags.
2011-01-06 12:02:17 -08:00
Bharat Mediratta fc6907dcfe Switch back to setting nodes as leaves, but fix the drop zone code to
allow dropping on leaves.
2011-01-06 11:46:15 -08:00
Bharat Mediratta 9682b7ea6e Remove unnecessary leaf param from TreeNode results. 2011-01-06 09:59:08 -08:00
Bharat Mediratta 0abd77c9e5 Fix typo. 2011-01-06 09:58:21 -08:00