stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 02:04:31 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,801 Commits 4 Branches 0 Tags
8fa370c49fa28741d6ff1bd9ca4ccc1f70dc37af
Commit Graph
2057 Commits
Author SHA1 Message Date
Bharat Mediratta 8fa370c49f Set the version to "3.0 git (pre-RC1)" 2009-09-13 22:59:58 -07:00
Bharat Mediratta c527e70f26 Merge branch 'master' of git@github.com:gallery/gallery3 into beta3_staging 2009-09-13 18:55:48 -07:00
Tim Almdal 6c0732e16f Set the AlbumTreeContainer instead of the height. This fixes ticket #755 2009-09-13 16:24:03 -07:00
Bharat Mediratta aed7ce9161 Specify a page anchor for the comments block. 2009-09-13 14:25:17 -07:00
Bharat Mediratta 21d6e17efa Don't add another comment form every time you click the [Add a 
comment] button.
 2009-09-13 14:19:04 -07:00
Kevin NehlsandBharat Mediratta 1499778b4a Remove raw HTML that's wrapped around the name of the file 
to create if not logged in as admin
 2009-09-13 14:09:50 -07:00
Bharat Mediratta 71a2e3624e Merge branch 'master' of git@github.com:gallery/gallery3 into beta3_staging 2009-09-13 01:04:41 -07:00
Bharat Mediratta caa2002d77 If there's a show= param and we can't find the given id in the current 
album, just ignore the parameter.
 2009-09-13 01:04:16 -07:00
Bharat Mediratta 51f6329a89 Update version to "3.0 beta 3" 2009-09-12 17:11:10 -07:00
Bharat Mediratta 823fa2fc83 Updated for url format changes applied in 2aad580f53. 2009-09-12 10:33:46 -07:00
Bharat Mediratta 6e2597f9f9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-12 10:12:38 -07:00
Bharat Mediratta 961bc3b185 Use user::display_name() in another case where it was missing. 2009-09-12 10:06:24 -07:00
Bharat Mediratta 0bb489b694 Properly internationalize the text for the By: line. This gets rid of 
the escaping problem.
 2009-09-12 10:02:27 -07:00
Tim Almdal 1d40c77c4c Update the organize module to use the release version of jquery Selectable. Unfortunately this does not have the functionality to select additional thumbnails using the ctrl or alt-keys, it is preferable to forking the Selectable component. This functionality should arrive with ui.jquery 1.8.x 2009-09-12 08:53:24 -07:00
Bharat Mediratta 7ec490b600 rawurlencode() path components in relative_path_cache and 
relative_url_cache so that they're safe for browser use.
 2009-09-11 11:04:35 -07:00
Bharat Mediratta af4411a447 Put the buttons for album/photo dialogs in their own group in the form 
so that they appear at the end, after any other groups that other
modules add.  Thanks Glooper!
 2009-09-10 21:55:36 -07:00
Bharat Mediratta 882a6d9a5d Convert a couple of instances of Item_Model::url(array(), true) to Item_Model::abs_url() 2009-09-10 21:33:04 -07:00
Bharat Mediratta 7fddd2aced Use abs_url() inside url::redirect() calls so that we don't just wind 
up tacking onto the base url.
 2009-09-10 21:31:50 -07:00
Tim Almdal fbb58671d1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-10 21:26:21 -07:00
Tim Almdal 25ea6085b7 Reset the margins when the mouse is over a thumbnail when dragging. When the border is displayed then adjust the margin to account for the border. Just hidding the border causes things to move. 2009-09-10 21:26:07 -07:00
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
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 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 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
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 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