stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 10:14:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,762 Commits 4 Branches 0 Tags
190d7aaa55b4f55ea3d93fb8a3d4650d7e1fc85c
Commit Graph
3762 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta 190d7aaa55 Remove debug code. 2009-09-10 21:12:15 -07:00
Bharat Mediratta b8053c9ddf Rename "after_installer" to "welcome_message" in the code to make it 
clearer what its purpose is.  Add some spacing in the theme for it
so that it's less cramped.
 2009-09-10 21:10:20 -07:00
Tim Almdal edb33334f1 Revert "Update the ui.selectable.js to dev r3202" 
This reverts commit 3f4868aac5.
 2009-09-10 10:55:21 -07:00
Tim Almdal 0633bfb2af Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-10 10:53:23 -07:00
Bharat Mediratta 752c857116 Rename ORM_MPTT::is_descendant() to ORM_MPTT::contains() to make the 
API a little clearer.  Write a test for it, too.
 2009-09-10 10:28:43 -07:00
Bharat Mediratta b550a06045 Rename $album to $target in move_to() 2009-09-10 10:08:29 -07:00
Tim Almdal 2bbe162339 A better fix for #741... the original problem was that the source and album variables were reversed 2009-09-10 10:09:09 -07:00
Tim Almdal 7925d5e292 Merge branch 'master' into talmdal_dev 2009-09-10 08:33:34 -07:00
Tim Almdal bea89be268 If the current drop target is not defined, in that we have moved out of the range of the current li elements, then assume the drop is occurring at the end of the list items. Fixes #742 2009-09-10 07:59:29 -07:00
Tim Almdal 90764b02e4 Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-10 06:21:10 -07:00
Tim Almdal eb345cb870 Changed the check in organize_Controller::move_to: 
1) check that target and source are not the same.
2) check that the source is not already a child of the target (use to be a
   descendant) Fixes #741.
 2009-09-10 06:17:21 -07:00
Tim Almdal 3f4868aac5 Update the ui.selectable.js to dev r3202 2009-09-09 22:34:08 -07:00
Bharat Mediratta 76df072e8e Reformat error messages in dialogs so that they don't overflow in weird ways. 2009-09-09 16:18:00 -07:00
Bharat Mediratta 6e65a8208f Fix a thinko-- of course we want urls to be the path to the file itself. 2009-09-08 21:52:15 -07:00
Bharat Mediratta 0df4b7d705 Fix line > 100 chars. 2009-09-08 21:49:28 -07:00
Bharat Mediratta 77bd3d3d40 Replace two preg_replace() calls with a single trim() call. 2009-09-08 21:49:09 -07:00
Bharat Mediratta 0709f7526d Change $this->_photo to just $photo 2009-09-08 21:33:45 -07:00
Bharat Mediratta 5d76a73596 Fix test to support new slug code. 2009-09-08 21:32:21 -07:00
Bharat Mediratta 2ca20e8ab1 Check for subscribers *before* going through the process of creating 
and rendering the email message.  Fixes ticket #724.
 2009-09-08 21:19:00 -07:00
Bharat Mediratta 3bd8be2651 Change the relative_path_cache and relative_url_cache columns to store 
urlencoded data for ease of use when we're dealing with the data.
This fixes ticket #569 by not allowing the urls that we put into our
RSS feeds to have bad characters in them.

We have to convert a path like var/albums/foo/"quotes"/bar.jpg into
something like var/albums/foo/%22quotes%22/bar.jpg.  If we take the
approach of storing native data in the cache, then we have to explode
the path, urlencode the bits, and implode it again to avoid escaping
the / char.  By storing it escaped, we avoid this problem. I believe
(but have not tested) that this is more efficient.
 2009-09-08 21:02:45 -07:00
Bharat Mediratta 6cfcab2a5e Amend the v12 installer to empty out the relative_url_cache and 
relative_path_cache columns.
 2009-09-08 20:59:39 -07:00
Bharat Mediratta 48becbe017 Update item::convert_filename_to_slug() to eliminate leading and 
trailing hyphens.
 2009-09-08 20:03:55 -07:00
Bharat Mediratta 453fb76443 Actually use the slug when creating new albums (instead of just converting the 
filename over).
 2009-09-08 20:00:04 -07:00
Bharat Mediratta f69dee8841 Trim leading and trailing hyphens from the slug. 2009-09-08 19:58:27 -07:00
Bharat Mediratta df85f43aa1 Remove unused $feed->link. 2009-09-08 17:05:38 -07:00
Bharat Mediratta cf0c8b6319 Minor tweaks to the url refactor. 2009-09-08 17:01:59 -07:00
Bharat Mediratta 2aad580f53 Move specialized (pretty) url generation back into Item_Model so that 
we're not relying on overriding url::site() to do tricks around item
urls.  This means that you won't get item urls by doing
url::site("albums/37"), for example, but it also means that we won't
get pretty urls where we don't expect them (like in the action of a
<form> element).

Incidentally, this will help us move over to using the slug format
because if you've got a bad character in a url, the edit forms will
now work on it since they'll be id based.
 2009-09-08 13:44:52 -07:00
Bharat Mediratta 6084848088 Improve comment. 2009-09-08 10:20:06 -07:00
Bharat Mediratta 2c9447bc1a Update to gallery module v12. 2009-09-08 09:59:27 -07:00
Bharat Mediratta 714a82d1e0 Automagically generate pretty urls for movies, too. 2009-09-07 21:49:19 -07:00
Bharat Mediratta 7889ae1085 Fix a bug where we were not properly decoding the path in the fallback 
code in get_item_from_uri() by using relative_url() instead of
relative_path().
 2009-09-07 21:33:00 -07:00
Bharat Mediratta 86f88769f9 Update Item_Model::save() to consider the relative_xxx_cache fields as 
insignificant, in addition to the view_count field.  This means that
we won't trigger an event, nor will we adjust the updated field if
*only* those fields are changed.
 2009-09-07 21:30:48 -07:00
Bharat Mediratta 78a42d9b83 1. Actually set the slug to the new value in the controllers. 
2. Fix up an issue where we were crashing if there were no conflicting rows
3. Amend Item_Model so that if you change the slug, it flushes the cache
   for all children
 2009-09-07 21:09:52 -07:00
Bharat Mediratta f28353f4e1 Add the 'Internet Address' field to all items, along with proper 
validation for the fields.
 2009-09-07 21:01:51 -07:00
Bharat Mediratta dccfce4c00 Correct a mental mistake in the prior change. All the xxx_url() 
methods actually refer to the url to the file on disk, not the logical
item.  That's relative_url().  Perhaps some API renaming is in order?
 2009-09-07 21:00:52 -07:00
Bharat Mediratta a73b5e8226 Switch to using Item_Model::relative_url() for the url path. 2009-09-07 20:59:42 -07:00
Bharat Mediratta 83ebc2e2b0 Remove unused item::validate_no_name_conflict() and a debug line. 2009-09-07 20:59:11 -07:00
Bharat Mediratta 2f666f4c52 Add item::validate_url_safe() with a test. 2009-09-07 20:07:37 -07:00
Bharat Mediratta d6ca881662 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-09-07 16:30:43 -07:00
Bharat Mediratta 6bc2235b27 Populate the slug field from the title as well. 2009-09-07 16:29:51 -07:00
Bharat Mediratta 795675e2b5 Add the slug to album, photo, and movie forms. 2009-09-07 16:21:58 -07:00
Bharat Mediratta 991bb0c063 Update golden file. 2009-09-07 16:21:58 -07:00
Bharat Mediratta 8e223ec4c1 Update golden file. 2009-09-07 15:45:18 -07:00
Bharat Mediratta 3f997562de Add support for a per-item "slug" which will be the user-visible url 
component for that given item.  Album hierarchies are represented by
nested slugs.  By default, we convert the filename to a slug when you
create an album, photo or movie.
 2009-09-07 15:42:08 -07:00
Bharat Mediratta 68a78f7cce Quiet down ffmpeg in movie::extract_frame() 2009-09-07 15:34:01 -07:00
Bharat Mediratta 14ba8505cc Don't allow users to take away their own edit permissions. If we 
detect that they did, just give it back.  There's no visible message
in that case.
 2009-09-06 11:45:41 -07:00
Bharat Mediratta 6c60310522 Don't show clickable link for breadcrumb items where the user doesn't 
have edit permissions.
 2009-09-06 11:34:51 -07:00
Bharat Mediratta 610c99cd04 Restore button text for any open panels when we open a new panel. 
Fixes ticket #723.
 2009-09-06 11:26:33 -07:00
Bharat Mediratta ac8c9d6670 Fix indentation. 2009-09-06 11:26:20 -07:00
Bharat Mediratta d8f5b0f5a3 Change click() to change() so that we immediately update the UI when 
the user picks a new option.
 2009-09-05 21:14:25 -07:00