summaryrefslogtreecommitdiff
path: root/modules/tag
AgeCommit message (Collapse)Author
2013-12-29Sort tag search results descending.Nathan Kinkade
2013-03-19Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2013-03-13#2061 - Remove Uploadify from add_photo_form/add_photo_form_completed events.shadlaws
- Added code around event calls in uploader to add Uploadify-specific JS to update the inputs. - Removed Uploadify JS from tag_event. Now it's uploader-agnostic. - Refactored tag_event autocomplete code (no functional changes).
2013-03-10#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.shadlaws
- removed autocomplete.css/js calls in server_add, tag, and g2_import. - revised xss_data.txt golden file (line number changes only).
2013-02-17Fix up autocomplete for admin_server_add - found and fixed some bugsBharat Mediratta
in gallery_autocomplete when "multiple" isn't set. Fixed some harmless syntax issues that js2-mode helpfully pointed out.
2013-02-14Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2013-02-03Super first pass:Bharat Mediratta
- jQuery 1.90 - jQuery UI 1.10 - Superfish 1.5.1 (minus all plugins) - jQuery Form 3.26.0-2013.01.28 Deleted all other jQuery plugins for now. - Reworked autocomplete to use the latest jQuery code. - Deleted references to $.browser.msie, no longer supported - Basic CSS support for autocomplete - lots more work needed there
2013-01-31Drop the requirement to have the install() function set the moduleBharat Mediratta
version. It's redundant. Fixes #1985.
2013-01-30Improve the display context API to return a "siblings_callback" fieldBharat Mediratta
containing a callback that returns all the siblings. Fixes #1975.
2013-01-25#1956 - Escape LIKE queries (for _ and %).shadlaws
In MySQL queries, _ and % characters are treated as wildcards (similar to ? and *, respectively). - Added escape_for_like function to MY_Database.php - Added unit test to Database_Test - Corrected the five unescaped instances in the code using this function.
2013-01-22gallery.menalto.com -> galleryproject.orgBharat Mediratta
codex.gallery2.org -> codex.galleryproject.org Fixes #1957.
2013-01-21Update copyright to 2013. Fixes #1953.Bharat Mediratta
2013-01-16Manually resolved conflict after recent pull.Nathan Kinkade
2013-01-13Tags by name (includes a G2 mapping)Mike Miller
2012-10-16Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-10-08Fix the delete function on item_tags and tag_items collections toBharat Mediratta
remove all tags from an item, or remove all items from a tag as appropriate (ie, empty the collection). Fixes #1902.
2012-08-06Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-07-21Avoid chaining after .gallery_autocomplete() - there are reports thatBharat Mediratta
it doesn't work with later versions of jQuery. Fixes #1889.
2012-06-01Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-05-19Create an ajax response framework that inserts <meta> tags to guardBharat Mediratta
against UTF-7, and create a $.gallery_autocomplete variant of jQuery's autocomplete that expects the first line to be a <meta> tag and discards it. More complete fix for #1871.
2012-05-15Send back form errors wrapped in JSON. Fixes #1867.Bharat Mediratta
2012-05-12Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-04-30Fix #1843.Bharat Mediratta
2012-03-06Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2012-02-27Update copyright to 2012. #1822Bharat Mediratta
2011-09-28Manually fixed a merge conflict after pulling.Nathan Kinkade
2011-08-27Refactor the display context code a bit:Bharat Mediratta
1) Move the display context code into the controller themselves so that it's more logically a continuation callback from the original controller rendering code. 2) Simplify the display context set/get code and put it in the item helper, it's just a couple of lines of code now. 3) Add more descriptive breadcrumb strings
2011-08-11Merge branch 'displayContext' into display_context_compressedTim Almdal
Conflicts: modules/gallery/controllers/movies.php modules/gallery/controllers/photos.php modules/tag/controllers/tag.php
2011-08-11Patch for tickets #1428 and #1760Tim Almdal
Create the concept of a Photo_Display_Context. If the user is browsing a dynamic album (i.e. tags) and chooses to look at an image in that album. The display of the image happens correctly, but the 'next' and 'previous' buttons are no longer consistent. When one of these is clicked, Gallery will open the adjacent image in the actuall album, not the dynamic album.
2011-08-11Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:Bharat Mediratta
- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents - Eliminate Breadcrumb::$id -- it's no longer necessary - Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents - Create Breadcrumb::set_first() and Breadcrumb::set_last() - Breadcrumb::build_from_list goes away, we just use arrays for this - Change Search_Controller and Tag_Controller to just create an array of Breadcrumb instances with the first/last marked appropriately - Breadcrumb_Test loses a bunch of complexity.
2011-08-11Initial commit of a patch for Ticket #1764. as discussed here: ↵Tim Almdal
https://github.com/gallery/gallery3/pull/58/files#r72949. Create a Breadcrumb library which has two static methods for_item (which takes a an item and builds the entire breadcrumb for the item) or build (which takes a variable number of Breadcrumb elements and creates a breadcrumb based on the specified elements). Used tag->url() to build the tag album url. Escaped the query string for the search. Tightened up the breadcrumb code in page.html.php. When adding the show query parameter, we can't blindly concatenate using the ? separator. We have to check that we use a & if a query parameter already exists.
2011-08-11Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-08-08Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:Bharat Mediratta
- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents - Eliminate Breadcrumb::$id -- it's no longer necessary - Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents - Create Breadcrumb::set_first() and Breadcrumb::set_last() - Breadcrumb::build_from_list goes away, we just use arrays for this - Change Search_Controller and Tag_Controller to just create an array of Breadcrumb instances with the first/last marked appropriately - Breadcrumb_Test loses a bunch of complexity.
2011-08-07Initial commit of a patch for Ticket #1764. as discussed here: ↵Tim Almdal
https://github.com/gallery/gallery3/pull/58/files#r72949. Create a Breadcrumb library which has two static methods for_item (which takes a an item and builds the entire breadcrumb for the item) or build (which takes a variable number of Breadcrumb elements and creates a breadcrumb based on the specified elements). Used tag->url() to build the tag album url. Escaped the query string for the search. Tightened up the breadcrumb code in page.html.php. When adding the show query parameter, we can't blindly concatenate using the ? separator. We have to check that we use a & if a query parameter already exists.
2011-06-02Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2011-05-24Follow on to c101151616033d53587d1435881dae0fa45aeefa -- delete allBharat Mediratta
tags in setup so that we have a blank slate, otherwise create_tag() will fail because sometimes there'll be other tags in the system. #1628
2011-05-12Changed this back to upstream version since now there is a user setting for ↵Nathan Kinkade
tag cloud size.
2011-05-12Manually merged a conflict after pulling from upstream.Nathan Kinkade
2011-04-27Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2011-04-24Revert my two "fixes" on top of Andy's tag combine change. Leave ↵Bharat Mediratta
Tag_Model::items() calling Item_Model::viewable() because it's too dangerous to separate that out, and it's fragile to rely on only admins doing tag combines. Revert "Undo the change made in 5ce85636329b14673718836b3631a3e46efdc3bb because it messes up tag counts" - This reverts commit 67d2e8081c6e5f0b679881bca3fdc81fe1e78ccc. Revert "Move the calculation for item_related_update ahead of the duplicate" - This reverts commit 5ce85636329b14673718836b3631a3e46efdc3bb.
2011-04-24For ticket #1701. Remove unused variable.Tim Almdal
2011-04-24Clarify the meaning of variable names.Tim Almdal
2011-04-23Allow the tag rename function to split a tag into multiple tags if a comma ↵Tim Almdal
is used to delinate the seperate tags.
2011-04-23Undo the change made in 5ce85636329b14673718836b3631a3e46efdc3bb because it ↵Bharat Mediratta
messes up tag counts (and makes the test fail-- I should have run that!). Also, use Tag_Model::items() in save() to avoid code duplication. Follow-on for #1628.
2011-04-23Oops, fix broken codex urls. For #1698.Bharat Mediratta
2011-04-23Oops, this is the rest of the modules and themes for #1696 and #1698.Bharat Mediratta
2011-04-23Move the calculation for item_related_update ahead of the duplicateBharat Mediratta
tag merge so that we don't trigger an item_related_update on items who semantically have the same tag after the merge. Follow-on for #1628.
2011-04-23Allow tags to be merged by renamingAndy Lindeman
* Fixes #1628
2011-04-23Insure that the tag count to display is always greater than 0. Refixes #1649.Tim Almdal
2011-04-23Insure that the tag count to display is always greater than 1. Refixes #1649.Tim Almdal