summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-01Write appropriate PHPdoc for json::reply.Bharat Mediratta
2010-08-01Specify the charset on the content type headerTim Almdal
2010-08-01Merge branch 'dialog' of github.com:gallery/gallery3 into dialogTim Almdal
2010-08-01Merge branch 'master' into dialogTim Almdal
2010-08-01Add a localized error message for missing usernames. Fixes ticket #1266.Bharat Mediratta
2010-07-31Full pass over all the JSON encoding and JS dialog code. We now abideBharat Mediratta
by the following rules: 1) An initial dialog or panel load can take either HTML or JSON, but the mime type must accurately reflect its payload. 2) dialog form submits can handle a pure HTML response, but the mime type must also be correct. This properly resolves the problem where the reauth code gets a JSON response first from the reauth code, and then an HTML response when you reauth and continue on to a given form -- try it out with Admin > Settings > Advanced. 3) All JSON replies must set the mime type correctly. The json::reply convenience function does this for us. 4) By default, any HTML content sent back in the JSON response should be in the "html" field, no longer the "form" field. The combination of these allows us to stop doing boilerplate code like this in our controllers: // Print our view, JSON encoded json::reply(array("form" => (string) $view)); instead, controllers can just return HTML, eg: // Print our view print $view; That's much more intuitive for developers.
2010-07-31"Save" -> "Download" for clarity.Bharat Mediratta
2010-07-31Merge branch 'dialog' of github.com:gallery/gallery3 into dialogBharat Mediratta
2010-07-31Resend the entire dialog content (including the wrapping view) instead of ↵Tim Almdal
just the form.
2010-07-31Sometimes in dialogs, the form is wrapped in a view to provide additional ↵Tim Almdal
information. We need to replace the contents of the entire dialog, not just the form, otherwise, there could be text floating around that doesn't make sense.
2010-07-31Missing the user name on the reauthenticate form.Tim Almdal
2010-07-31When the admin controller redirects to the reauthenticate controller, the ↵Tim Almdal
value of request::is_ajax() from the original request is lost. This patch stores its value in the session so the reauthenticate controller knows whether its in a dialog/panel or not.
2010-07-31Correct the name of the JSON member that contains the form data.Tim Almdal
2010-07-31Convert the admin_theme controller to use the json::reply methodTim Almdal
2010-07-31More patches as part of #1225. Change the 'core' modules to use the json::replyTim Almdal
method to set the content type header and encode the response as a json object
2010-07-31Partial fix for #1225 addresses the issues with the user edit forms.Tim Almdal
2010-07-31Partial fix for #1225. Create a json reply helper that sets the content type ↵Tim Almdal
to application/json and then json encodes the reply.
2010-07-31Partial fix for #1225. Change the dialog and panel handling to look at the ↵Tim Almdal
mime type returned to determine the content type.
2010-07-31Fix typo: ui-corners-all --> ui-corner-allBharat Mediratta
thanks Lord Beowulf!
2010-07-31Use readfile() instead of fopen()/fpassthru()/fclose() for brevity.Bharat Mediratta
I've done some tests on a 60M flv and found that there's no difference in memory consumption with these three approaches: public function test() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; if ($fd = fopen($file, "rb")) { while (true) { $bits = fread($fd, 65535); if (strlen($bits) == 0) { break; } print $bits; set_time_limit(30); } fclose($fd); } Kohana_Log::add("error","test: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); } public function test2() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; $fd = fopen($file, "rb"); fpassthru($fd); fclose($fd); Kohana_Log::add("error","test2: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); } public function test3() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; readfile($file); Kohana_Log::add("error","test3: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); }
2010-07-30Merge branch 'master' into dialogTim Almdal
2010-07-29Add recovery code for dupe slugs and dupe names to the general purpose FixBharat Mediratta
task. Fixes ticket #1260.
2010-07-29We don't care about the name and slug for the root album so don't bother ↵Bharat Mediratta
enforcing them.
2010-07-29Trap ORM_Validation_Exception specially and report which fields failed ↵Bharat Mediratta
validation.
2010-07-29Resend the entire dialog content (including the wrapping view) instead of ↵Tim Almdal
just the form.
2010-07-29Sometimes in dialogs, the form is wrapped in a view to provide additional ↵Tim Almdal
information. We need to replace the contents of the entire dialog, not just the form, otherwise, there could be text floating around that doesn't make sense.
2010-07-29Missing the user name on the reauthenticate form.Tim Almdal
2010-07-29Merge branch 'master' into dialogTim Almdal
2010-07-28Put the having clause after the group by clause to resolve this upstream issue:Bharat Mediratta
http://dev.kohanaframework.org/issues/2923
2010-07-28Combine the Fix MPTT and Fix Permissions tasks into one magical fix-itBharat Mediratta
task.
2010-07-28When the admin controller redirects to the reauthenticate controller, the ↵Tim Almdal
value of request::is_ajax() from the original request is lost. This patch stores its value in the session so the reauthenticate controller knows whether its in a dialog/panel or not.
2010-07-27Merge branch 'master' into dialogTim Almdal
2010-07-27"public static" ==> "static" to match code conventions.Bharat Mediratta
2010-07-27Revert "Combine all the flex runtime libraries into a single downloadable ↵Bharat Mediratta
file. Fixes ticket #1241." This breaks organize on Chrome 5 (Linux) and Chrome 6 (OSX). See ticket #1241. This reverts commit 423fca2d5ffca1e953694793ad118589db1756d0.
2010-07-27VerifiedBharat Mediratta
2010-07-27Fix the "get flashplayer" button. It was throwing a JS error before.Bharat Mediratta
Not sure why it was done in JS in the first place. Fixes ticket #1256.
2010-07-27UpdatedBharat Mediratta
2010-07-27Don't invoke a graphics toolkit when setting the album cover from aBharat Mediratta
clean thumbnail; we can just copy it over. Should be a decent perf improvement in many cases. Fixes ticket #1255.
2010-07-27Update the mock so that all responses return arrays, not stdClass().Bharat Mediratta
2010-07-26Fix ticket #1253 where the maintenance page bombs if you have alreadyBharat Mediratta
configured your Gallery 2 import but you move your Gallery 3.
2010-07-26Correct the name of the JSON member that contains the form data.Tim Almdal
2010-07-25Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-07-25Add a new maintenance task that resyncs album .htaccess files withBharat Mediratta
database access intents. Use this to fix up .htaccess files after you relocate your Gallery. Fixes ticket #1252.
2010-07-25Move the "cancel all" running tasks button up to make it consistent with the ↵Bharat Mediratta
"remove all finished" button.
2010-07-25Don't use hardcoded id 1 as the everybody group; it won't work with ↵Bharat Mediratta
alternative auth schemes.
2010-07-23Convert the admin_theme controller to use the json::reply methodTim Almdal
2010-07-23More patches as part of #1225. Change the 'core' modules to use the json::replyTim Almdal
method to set the content type header and encode the response as a json object
2010-07-23Partial fix for #1225 addresses the issues with the user edit forms.Tim Almdal
2010-07-23Partial fix for #1225. Create a json reply helper that sets the content type ↵Tim Almdal
to application/json and then json encodes the reply.
2010-07-23Partial fix for #1225. Change the dialog and panel handling to look at the ↵Tim Almdal
mime type returned to determine the content type.
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 20:09:35 +0000