stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-15 11:27:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,856 Commits 4 Branches 0 Tags
4e6f2f1b4c489c21546c2ae685b814c42e689d71
Commit Graph
130 Commits
Author SHA1 Message Date
Tim Almdal 9d76797b17 Changed the search module installer to explicitly specify MyISAM as the database type. Changed the packager to not remove the engine specification if the table is search_records. Fixes Ticket #774 2009-09-16 22:23:32 -07:00
Andy Staudacher e168e0dfae CSRF / auth fixes, golden data file checkpoint 2009-09-15 21:50:48 -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 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
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 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 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 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 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 d007f31686 Undo rest of the indentation issue accidentally created in 8312eb and 
partially fixed in 2c30dc
 2009-09-02 21:29:22 -07:00
Tim Almdal 2c30dc2d5b fix a leading space that was causing the file_structure_test to fail 2009-09-02 14:28:00 -07:00
Andy Staudacher b50d7f0d69 Fix bug #522 - Handle "save settings" correctly in the "share translations" form. 2009-09-01 11:11:22 -07:00
Bharat Mediratta c887170555 Stay on the same page when editing albums/movies/photos. Fixes ticket 2009-08-31 21:10:22 -07:00
Andy Staudacher 8312eb116e XSS review fixes (mostly adding missing html::mark_clean()) calls. 2009-08-31 02:12:01 -07:00
Andy Staudacher ddb84c84e1 Rename mark_safe() to mark_clean() 2009-08-31 00:42:18 -07:00
Andy Staudacher df38a890a6 Tabs to spaces cleanup 2009-08-30 18:07:13 -07:00
Andy Staudacher effccfd41d Change all instances of SafeString::of_safe_html() to html::mark_safe() in views. 2009-08-30 07:00:56 -07:00
Andy Staudacher b9bd1681a3 Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly. 2009-08-29 22:54:20 -07:00
Andy Staudacher f327b4ad38 Fix link in l10n UI (for SafeString changes) 2009-08-29 14:24:52 -07:00
Andy Staudacher a5dfc81a8f Merge commit 'upstream/master' 
Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php
 2009-08-29 14:17:48 -07:00
Andy Staudacher c01ac42c46 Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify(). 
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
 2009-08-29 12:48:40 -07:00
Andy Staudacher a2e2a2178b Using SafeString in album controller / view 2009-08-29 10:40:34 -07:00
jhilden c234f9fd39 improved translations admin interface 2009-08-28 20:53:06 -04:00
jhilden 1855642bd1 improved UI for the languages admin 
this should take care of bug #329
 2009-08-28 16:19:41 -04:00
Tim Almdal f27919aa1e Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 21:56:27 -07:00
Bharat Mediratta a28dd09c4e Properly deal with invalid images. This fixes ticket #611 which shows 
a BMP masquerading as a .jpg causing us to be unable to rebuild
resizes and thumbnails.  Now if that happens, we discard the file, log
it and move on.
 2009-08-27 17:04:48 -07:00
Tim Almdal 377bdf2803 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 16:29:22 -07:00
Bharat Mediratta 4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use 
the system's default table specification.  Fixes ticket #597.
 2009-08-27 15:47:54 -07:00
Tim Almdal 2da7f93784 Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-20 12:26:47 +08:00
Tim Almdal c85df82fde Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher
 2009-08-19 21:24:05 -07:00
Tim Almdal bc42df35ee Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-19 05:14:05 -07:00
Chad Kieffer 3b8323d5b4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-18 23:08:32 -06:00
Tim Almdal 2ac916783a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-18 18:48:17 -07:00
Bharat Mediratta 67d770fb2a Don't call dirname() on the toolkit dir, it's already a directory! (Thanks Kaare) 2009-08-18 13:48:00 -07:00
Tim Almdal 76f320ab3d In this patch, drag now works to the album tree, but the progress bar is not 
showing. As well fixed a problem where selectable single clink no longer
worked when the album was reloaded.
 2009-08-16 12:36:14 -07:00
Bharat Mediratta 7aac471b82 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch 
Conflicts:
	modules/gallery/js/quick.js
 2009-08-08 20:56:06 -07:00
Bharat Mediratta c9f5000e65 Improve the graphics toolkit detection code so that properly 
identifies situations where its restricted by open_basedir.

We now track more informatoin about the toolkit including the version
and any errors we encountered while doing the detection so that we can
provide more info downstream.  This makes graphics::detect_toolkits()
a little heavier, but that's ok because it should not be called very
often.

In the process, refactor the controller and view hierarchy so that
it's a little more straightforward in the code.

Fixes ticket #616.
 2009-08-08 20:31:16 -07:00
Bharat Mediratta 52147cf6f8 Combine the quick menu and the thumb menu into a single menu called 
the "context" menu.

This new context menu is generated using the typical event processing
system, like our other menus.  The specialized quick CSS and JS is now
gone, replaced by our generic menu handling code.  It's all rolled
together currently using the thumb_menu UI for easy packaging.  All
the CSS and JS is updated.

NOTE: the non-dialog links (rotate, album_cover) have a broken UI
because they return JSON which the quick.js code handled specially,
but we don't handle properly now.  I need to fix this.
 2009-08-03 21:45:54 -07:00
Tim Almdal f5c4d23e57 Convert the album add dialog to use the new Form_Script library 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 21:39:05 +08:00
Tim Almdal dfaf870310 Convert the album add dialog to use the new Form_Script library 2009-07-28 06:33:25 -07:00
Tim Almdal a7f4d7aced Revert commit 078c77a62b and change the 
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 21:00:25 +08:00
Tim Almdal 2e8f73d4e9 Revert commit 078c77a62b and change the 
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.
 2009-07-28 05:40:28 -07:00
Tim Almdal 078c77a62b Add tag autocomplete to the album and photo edit pop up dialogs. 
This required putting a wrapper view around the forms and passing
this view as the parameter to the item_edit_form event.  The view
contains a $script variable that the modules can add script to be
included in the form html when rendered as part of the ajax response.
 2009-07-24 14:18:15 -07:00
Bharat Mediratta f83db99d39 Properly display thumbnails for private movies by backtracking from 
the thumbnail to the movie and then showing it as a JPG.  Fixes ticket
#570.
 2009-07-21 12:26:16 -07:00
Bharat Mediratta 8f1bca7459 Remove the fallback code. It should trigger extremely rarely and seems highly inefficient to me, so let's see if we can live without it. 2009-07-21 12:18:49 -07:00
Bharat Mediratta 60d6058880 Make some API changes simplify the tag editing code. We now have a 
good pattern for allowing modules to add their own hooks to item forms!

1) Album, photo and movie forms now all use edit_item as the group and
   we publish item_edit_form and item_edit_form_completed events which
   makes it much easier in the module to handle all events.  They can
   still differentiate based on $item->type if they want to.

2) Added tag::clear_all() and tag::compact() functions which takes the
   place of hiwilson's tag::update() function and is now used in
   tag_event::item_delete().  This provides a simple API that allows
   us to have a lot less event handling code.  It's less efficient
   than what hiwilson was doing before in that it will delete and
   re-add tags, but if that ever turns out to be a performance issue
   we can do something about it then.
 2009-07-20 08:51:12 -07:00
hiwilson 709d6c5faf (1)Add tag edit field in album/photo edit form. (2)provide edit functionality. (3)support multi-word tagging. 2009-07-20 08:02:07 -07:00
Bharat Mediratta df22832a5b Rename "locale" helper to "locales" to avoid conflicting with PHP 5.3. 
Fixes ticket #194
 2009-07-17 18:35:06 -07:00