Commit Graph
4723 Commits
Author SHA1 Message Date
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 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 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
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
colings 02a349f68a Merge remote branch 'upstream/master' 2011-01-09 11:43:45 -06: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
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