summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-16Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-06-16Add REST support for comments. You can view, add, edit and deleteBharat Mediratta
comments.
2010-06-16Fix a typo... The controller parameter to the flex organize module should be ↵Tim Almdal
controllerUri instead.
2010-06-16Add start/num query parameters to tags::get()Bharat Mediratta
2010-06-16If the G2 orderBy or orderDirection fields are blank, use the G2 defaults.Bharat Mediratta
Second half of fix for #1054.
2010-06-16Fix a bug introduced in 1077477a9032d5a4855e19e2dd4ce923472b711c whereBharat Mediratta
we don't generate album highlights correctly. Possible fix for #1054.
2010-06-16Fix two bugs:Bharat Mediratta
#1161: guest comments get dropped because of a missing email address. #1075: G2 comments with " get turned into "
2010-06-16Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-06-16slap my wrist... i forgot a debugging statementTim Almdal
2010-06-16Fix for ticket #1131. If the rss feed is for an item, then retrieve the ↵Tim Almdal
item. Using the left and right pointers find all the comments for the child items. Thanks to jankoprowski for the initial investigation.
2010-06-16Fix issue1068. Fill from_id field in photo with indetificatorJan Koprowski
2010-06-15Revert "Add a "convert_ids" parameter to Item_Model::as_restful_array(), which"Bharat Mediratta
This reverts commit 98fce83de5f772482382bfabdbcd94c25ecdbb1a. Conflicts: modules/gallery/tests/Item_Model_Test.php
2010-06-15Guard against relationships() not returning an array.Bharat Mediratta
2010-06-15Revert "Change the item rest update processing to call theBharat Mediratta
item::move(source, 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. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move." Rolling this back for a couple of reasons: 1) Bug in move.php ("message.info" is not a function name) 2) Having the message come back from the API call as a side-effect is sloppy. We should find a cleaner way to do this checking. 3) having item::move() call save() on any changed values in the ORM is counter-intuitive. Move should move, save should save. I think the right approach here is to roll the move() code properly into save(). This reverts commit 2492280cc0ec9eb64a8daeccc7b5698ece7fea66.
2010-06-15Revert "Fix for ticket #1118. Create a item::save_with_retries helperBharat Mediratta
method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly." Rolled this back because it fails KISS. We already have an API for saving models with Item_Model::save() that's consistent with all of our other model code. Adding a new way to save items is confusing and inconsistent. This reverts commit 9504f71efcadc7ed27f6f09e5d663e8025bf3b86.
2010-06-15Bump the organize module to version 2, and check to make sure that theBharat Mediratta
REST module is active.
2010-06-15Fix a bug in the upgrader where we weren't bumping the version numberBharat Mediratta
during the upgrade path, so the 2nd stanza (version 2 to version 3) was never getting executed.
2010-06-15Make the "name" column a little wider.Bharat Mediratta
2010-06-15Update the description.Bharat Mediratta
2010-06-15Install the rest module by default.Bharat Mediratta
2010-06-15New dump generated by new mysqladmin has a slightly different format:Bharat Mediratta
mysqladmin Ver 8.42 Distrib 5.1.47, for debian-linux-gnu on i486 Also, updated for comment module v2.
2010-06-15Sort files by path in _dump_var() for consistent output.Bharat Mediratta
Skip . and .. (PHP 5.3 iterators seem to include those now).
2010-06-15Remove a stray period.Bharat Mediratta
2010-06-15Fix for ticket #1118. Create a item::save_with_retries helper method, which ↵Tim Almdal
encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly.
2010-06-15Change the item rest update processing to call the item::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. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move.
2010-06-15Only change the weights of the album children if the item sort_column is set ↵Tim Almdal
to weight.
2010-06-15Revert "Change the item rest update processing to call the ↵Tim Almdal
itemm::move(source, 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." This reverts commit 603d4640141a43350f50da747d747456b28fdd93.
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-15Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2010-06-15url::site(...) adds a leading slash to the uri it generates. Take this into ↵Tim Almdal
account when creating the base url for accessing rest requests. Update the sort dropdown box to manual when album items are rearranged.
2010-06-15Add a simple/cheap test to make sure that the database config is ok. Fixes ↵Bharat Mediratta
ticket #1029.
2010-06-15The fact that we have a path to a G2 embed file doesn't mean that it's stillBharat Mediratta
valid so check to see that it's ok before proceeding. This should resolve #458.
2010-06-15add an 'icon' to identify albums in the organize dialog.Tim Almdal
2010-06-15Removed self-closing slash from opening <li> tag.ckieffer
2010-06-14Add a simple/cheap test to make sure that the database config is ok. Fixes ↵Bharat Mediratta
ticket #1029.
2010-06-14The fact that we have a path to a G2 embed file doesn't mean that it's stillBharat Mediratta
valid so check to see that it's ok before proceeding. This should resolve #458.
2010-06-14Change the parameters for the organize dialog box. The baseUrl parameter was ↵Tim Almdal
removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box.
2010-06-14Merge branch 'master' of github.com:gallery/gallery3Chad Kieffer
2010-06-14Removed self-closing slash from opening <li> tag.ckieffer
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-13Hide the admin menu and show it after it's loaded to minimize flicker.Bharat Mediratta
Normalize the comment text about this interaction between admin_wind and wind.
2010-06-13Remove a debugging statement.Tim Almdal
2010-06-13Move the source to the gallery3-flex repository.Tim Almdal
2010-06-13Fix problems ith IE and flex initialization when one of the flashvars ↵Tim Almdal
contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome
2010-06-13Merge branch 'master' into talmdal_devTim Almdal
2010-06-12Fix up some indentation and comment style.Bharat Mediratta
2010-06-12Bounce the user to the login page if they try to get to part of theBharat Mediratta
admin site as a guest. Also, theme the login/html page.
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.