summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
AgeCommit message (Collapse)Author
2010-06-15Change the item rest update processing to call the itemm::move(source, ↵Tim Almdal
target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight.
2010-06-14Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2010-06-13Replace __CSRF__ with the actual csrf token.Bharat Mediratta
2010-06-13Change single to double quotes.Bharat Mediratta
2010-06-13Merge branch 'master' into talmdal_devTim Almdal
2010-06-12Make login/logout continuation url code consistent. Where necessary,Bharat Mediratta
we specify the continue_url in the session, but we store it in the login form so that we can propagate it across the session creation that happens at login time.
2010-06-12Use "continue_url" instead of "continue" for consistency with theBharat Mediratta
reauth code.
2010-06-12Stop trying to parse the continue url in the logout controller becauseBharat Mediratta
it requires us to reproduce a bunch of complex routing logic. Instead, just have the logout link generating code generate a link that's visible to guests.
2010-06-10Change the pattern used to convert the file name to a title. Fixes ticket#1061Tim Almdal
2010-06-09Revert the "preserve_ids" global query parameter. We decided that it was aBharat Mediratta
bad idea. This reverts commit 6425d41eddd44091b2d83ba3c3734cc6990ca581.
2010-06-08Don't use the standard error formatting for exceptions that have occurred as ↵Tim Almdal
part of a REST request. Format the exception as a json encoded text string so the client can extract the fault information if they so choose.
2010-06-07Add a "preserve_ids" global query parameter for REST requests thatBharat Mediratta
indicates that we shouldn't opportunistically convert ids into REST urls.
2010-06-07Merge branch 'master' into talmdal_devTim Almdal
2010-06-06Don't show the rotate links if the active user can't edit the photo. Fixes ↵Bharat Mediratta
ticket #1157. Thanks to psvo.
2010-06-06Try to adjust for situations where /proc/loadavg is_readable() butBharat Mediratta
generates an error if we call file() on it. Fixes ticket #1149.
2010-06-06Merge branch 'master' into talmdal_devTim Almdal
2010-06-06Fix an unused variable caused by converting straight query paramsBharat Mediratta
to $entity based params.
2010-06-06Change "ancestor_for" to "ancestors_for" for consistency.Bharat Mediratta
2010-06-05item::random_query() doesn't need to take a "where" clause becauseBharat Mediratta
it's returning a query, so the caller can add the where clause himself. This makes for a cleaner API.
2010-06-05Undo the change added in e4eedbce2298535540cb651d75ba6f1bf42cf02bBharat Mediratta
which deactivates modules on upgrade. No idea why we did that, but it breaks upgrading because it deactivates any module that's been upgraded.
2010-06-05Fix a comment typo.Bharat Mediratta
2010-06-04Change the name of the private format_restful_item to _format_restful_item ↵Tim Almdal
so that the File_Structure_Test will pass.
2010-06-04Save the item before updating the order of the children. Also always ↵Tim Almdal
increment the weight count (even if it is equal to the weight of the current child)
2010-06-04Allow the use of the type query parameter to filter the results of a ↵Tim Almdal
rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e)
2010-06-04Remove the item id from the rest/gallery/items url as that was inconsistent. ↵Tim Almdal
Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php
2010-05-28If the file is empty (i.e. the upload failed, then throw a 'bad request' ↵Tim Almdal
exception before trying to create the item.
2010-05-18Save the item before updating the order of the children. Also always ↵Tim Almdal
increment the weight count (even if it is equal to the weight of the current child)
2010-05-15Allow the use of the type query parameter to filter the results of a ↵Tim Almdal
rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e)
2010-05-15Remove the item id from the rest/gallery/items url as that was inconsistent. ↵Tim Almdal
Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php
2010-05-14Fix-ups for d98b85f7d3142676e6b4f407a18ed81564823f88Bharat Mediratta
- Pass the CSS selector of the active image in as an arg to site_menu so that quick operations know what they're operating on. - Change the ids from g-{photo,movie}-id to the generic g-item-id - Initialize ajax handlers for site menu on the photo and movie page - Drop the movie context menu, it's now in the site menu
2010-05-14Merge branch 'master' of github.com:gallery/gallery3Chad Kieffer
2010-05-14Drop context_menu for wind's photo/resize view. Move photo edit options to ↵ckieffer
the site_menu.
2010-05-10Pick a new album cover when the photo that's the current cover isBharat Mediratta
deleted. Fixes ticket #1083.
2010-05-08Deleted extra CSS class assignment for context_menu delete option.ckieffer
2010-04-17Don't show the member element for non-collection elements in the response. ↵Bharat Mediratta
Having a members sidebar element indicates to the rest clients that this is a resource collection. Conflicts: modules/gallery/helpers/items_rest.php
2010-04-16Only return the members element to the rest client if the item is an album. ↵Tim Almdal
This makes it consistent to the rest client that collections will have a members element.
2010-04-16Merge branch 'master' into bharat_devBharat Mediratta
2010-04-10Add album_add_form event to album::get_add_form().Bharat Mediratta
2010-04-10Add error messages to theme::get_edit_form_admin()Bharat Mediratta
2010-04-07Merge branch 'master' into bharat_devTim Almdal
2010-04-04Move the "Fix MPTT" task from the rescue module into the main GalleryBharat Mediratta
module.
2010-04-04REST changes: Allow PUT and POST requests to modify members, notBharat Mediratta
just entity. TESTS ARE NOT UPDATED YET. - Fix item_rest::get() to maintain the proper sort order, which requires duplicating some Item_Model code. - Elide "weight" from the REST version of item - Adjust the weight of members according to the order they're returned from the client. You can't add or remove members here, you can only reorder them. - Changed the wire protocol to handle more complex values. Now "entity" and "members" are JSON encoded. The Gallery3 helper does this correctly. - Changed the wire protocol for tag_item -- now it stores the tag and item urls in the entity, not as members. This is more consistent. - Added missing security for renaming and deleting tags. - Got rid of vestigial tag_rest::post(). We add/remove tags via the relationship.
2010-04-02Always return an array from item_ordered_members_rest::relationships()Bharat Mediratta
2010-04-01Add a new resource for managing child item orders.Bharat Mediratta
2010-03-05Merge branch 'master' of git://github.com/fpaterno/gallery3Bharat Mediratta
2010-03-03Update the copyright to 2010. It's only 3 months into the year :-)Bharat Mediratta
2010-03-01Fix bug #1015 : repeated ids are prohibitedFlorent Paterno
2010-02-28Fix profiler display: It looks like it was broken by an API change in the ↵Andy Staudacher
latest kohana upgrade.
2010-02-27Fix for ticket #1035: Make .htaccess access rules work for the case when ↵Andy Staudacher
index.php isn't part of generated URLs.
2010-02-27Fix for ticket #1037: Only show language drop-down when there's actually a ↵Andy Staudacher
choice.