summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
2010-06-12Use "continue_url" instead of "continue" for consistency with theBharat Mediratta
reauth code.
2010-06-12Push the continue url into the form for consistency with otherBharat Mediratta
login/continue 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-12Revert "Fix for ticket #1118. The item validation was flagging duplicate ↵Bharat Mediratta
slugs as errors. There was already code in the item save to insure that any" This introduces a bug where you can create two items with the same slug. This reverts commit cb01f4017d70a7d73273052b424e8b78b794bc1c.
2010-06-11Fix for ticket #1118. The item validation was flagging duplicate slugs as ↵Tim Almdal
errors. There was already code in the item save to insure that any duplicates were made unique, so this patch removes the validation as unnecessary.
2010-06-11Remove the duplicate query when searching as pointed out by joe7 on ticket #844Tim Almdal
2010-06-11Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2010-06-11Fix for ticket #1039. The problem was, as Bryan76 pointed out, with passing ↵Tim Almdal
the full url in the continue parameter. In the logout controller, we tried to get the item from the url so we could check the permission of the item to insure that the guest user had access. But url::get_item_from_url expects a relative url.
2010-06-11Send back the REST API version as a header. It's on every request,Bharat Mediratta
which sucks, but it's totally unobtrusive because it's a header so that's ok. Decided that the current version is "3.0" although it will surely change before the final 3.0 release. Fixes ticket #1148
2010-06-11Fix for ticket #797Tim Almdal
When load a file is uploaded using a dialog box and the jquery plugin ajaxForm, the ajaxForm plugin uses an hidden iFrame element to send the multi-part form and this is where the response goes. The ajaxForm plugin then retrieves the document body and parses the result as a json string. If the file uploads properly everything is fine, but if it fails Gallery3 return the input form with the the error fields highlighted as part of the json response. As this response is returned to a hidden iframe, the browser attempts to manipulate it and all hell breaks loose. We lose the trailing brace, we start getting escaping of form tags. When the ajaxForm plugin retrieves the iFrame body its no longer a valid json frame and the parsing fails and the user sees no indication that it failed.
2010-06-11Actually execute the database query that updates the album view count. Fixes ↵Tim Almdal
ticket #1092. Thanks to shinta for pointing the way.
2010-06-11Actually execute the database query that updates the album view count. Fixes ↵Tim Almdal
ticket #1092. Thanks to shinta for pointing the way.
2010-06-10Change the pattern used to convert the file name to a title. Fixes ticket#1061Tim Almdal
2010-06-10Correct a problem with the sort order and sort direction fields being ignored.Tim Almdal
2010-06-10Review the code for xss exposures and provide the functionality to update ↵Tim Almdal
the organize dialog bar when the selected album changes.
2010-06-10Provide better handling and a progress dialog when loading or updating files.Tim Almdal
2010-06-10Tweak the error response for rest requests to make it easier for the client ↵Tim Almdal
to extract error information.
2010-06-10Merge branch 'master' into talmdal_devTim Almdal
2010-06-09New version of EXIF gets ISO and Metering Mode right. Yay!Bharat Mediratta
2010-06-09Update golden fileBharat Mediratta
2010-06-09In GalleryCodeFilterIterator::accept(), ignore . and .., and stop caring ↵Bharat Mediratta
about .svn
2010-06-09Fix get_ancestor_test() since the parameter was renamed to ancestors_for.Bharat Mediratta
2010-06-09Revert the "preserve_ids" global query parameter. We decided that it was aBharat Mediratta
bad idea. This reverts commit 6425d41eddd44091b2d83ba3c3734cc6990ca581.
2010-06-08Add a "can_edit" field to the Item_Model's REST output. It'sBharat Mediratta
applicable to the current user.
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-08The status message for an HTTP 400 status should always be 'Bad Request', if ↵Tim Almdal
I'm reading the specification right.
2010-06-07Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
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-07Add a "convert_ids" parameter to Item_Model::as_restful_array(), whichBharat Mediratta
we can turn on with a query parameter.
2010-06-07Improve a comment.Bharat Mediratta
2010-06-07Tweak the test setup code to always copy database.php; something isBharat Mediratta
going wrong that's nuking test/var/database.php -- I'll figure that out, but in the meantime we can make this code more robust.
2010-06-07Don't recreate test/var/logs if it already exists. This fixes aBharat Mediratta
rather circuitous problem where if we have a failure early enough in the cycle, the failure is masked by our mkdir attempt. Even though we use @ to mask the error, the error handler still picks it up and turns it into an exception in Kohana_PHP_Exception::shutdown_handler() which obscures the real problem.
2010-06-07Merge branch 'master' into talmdal_devTim Almdal
2010-06-07If the identity provider changes then delete all the rest user_access_keys, ↵Tim Almdal
as they are no longer valid. (i.e. all the related users have been deleted.)
2010-06-07Update the rest client to use ancestors_for instead of ancestor_for.Tim Almdal
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-06Updated to ExiferBharat Mediratta