summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-08Change file modes to 644.Bharat Mediratta
2010-08-07A new REST resource that allows access to view and modify the actualBharat Mediratta
contents of the file, which enables REST viewers to see the actual data which is useful when the files are privileged. Currently it returns the contents of the file in JSON encoded form, which may not be the best. Multipart/mime might be much better. Fixes ticket #1224.
2010-08-07Add the ability to replace the source data file in Item_Model::save().Bharat Mediratta
Refactor the rotate code in Quick_Controller to replace the data file, and then have gallery_event::item_updated_data_file() pick up after the change is saved, rebuild the image and handle album covers. This is much more portable than before and it will allow any mechanism (eg: REST) to replace the source image.
2010-08-07Add a max_level to _sanitize_for_dump() so that we don't blow the stack.Bharat Mediratta
2010-08-07Whitespace fix.Bharat Mediratta
2010-08-07Add an index for left_ptr, since we use that in ORM_MPTT::parents()Bharat Mediratta
which is on every album page. Bump Gallery module version to 33.
2010-08-07Merge branch 'master' into bharat_devBharat Mediratta
2010-08-07Merge branch 'master' into bharat_devBharat Mediratta
2010-08-07Oops. Fix the upgrader path to add the weight column to the modules table.Bharat Mediratta
2010-08-06Add a "weight" column to the module table. This allows us to specifyBharat Mediratta
module ordering, which is currently being done in the moduleorder contrib module. By default, the weight will be the same as the id of the row which means that new modules will get added at the end of the list. This is covered in the upgrade case as well. The one gotcha is that we need to make sure that we don't try to sort by the weight column if the gallery module version is < 32, which is something we haven't done before. Fixes ticket #1272.
2010-08-06Add a "weight" column to the module table. This allows us to specifyBharat Mediratta
module ordering, which is currently being done in the moduleorder contrib module. By default, the weight will be the same as the id of the row which means that new modules will get added at the end of the list. This is covered in the upgrade case as well. The one gotcha is that we need to make sure that we don't try to sort by the weight column if the gallery module version is < 32, which is something we haven't done before.
2010-08-06Use module::install and module::activate for the gallery module asBharat Mediratta
well; I've verified that it generates the same installer files.
2010-08-04Add docs reflecting that we may skip some items that have invalid parent_idsBharat Mediratta
2010-08-04Update the wind theme thumbnail to be more reflective of the actual theme ↵Tim Almdal
(i.e. the layout has changed since the thumbnail was created.)
2010-08-03Replace overlooked 'form' parameter in json response with 'html'.Tim Almdal
2010-08-01Fix the i18n error message for missing/incorrect password. Fixes ticket #1265.Bharat Mediratta
2010-08-01Use the login/html page for maintenance mode; we don't need theBharat Mediratta
maintenance controller/view anymore. Fixes ticket #1267.
2010-08-01While we're cleaning up albums, also find any cases where we have anBharat Mediratta
album_cover_item_id that points to an invalid item.
2010-08-01default maintenance_mode from false -> 0 for consistency with the value we ↵Bharat Mediratta
set in the db
2010-08-01Updated for gallery module v31.Bharat Mediratta
2010-08-01Make maintenance mode a variable instead of a config. Then createBharat Mediratta
links on the Admin > Maintenance page to allow you to turn it on and off. This should be efficient since we cache all vars and look them up on every request anyway. This also allows us to have the Fix task enable maintenance mode while it's running which greatly reduces the chances that somebody will come along and hork the database while we're tinkering with MPTT pointers. Fixes ticket #1259.
2010-08-01Make the continuation url go to admin/maintenance.Bharat Mediratta
2010-08-01Focus on the username field by default. Don't use jQuery because we're ↵Bharat Mediratta
operating in a very limited context.
2010-08-01Force the response type for uploaded watermarks to text/html.Bharat Mediratta
// Override the application/json mime type. The dialog based HTML uploader uses an iframe to // buffer the reply, and on some browsers (Firefox 3.6) it does not know what to do with the // JSON that it gets back so it puts up a dialog asking the user what to do with it. So force // the encoding type back to HTML for the iframe. // See: http://jquery.malsup.com/form/#file-upload
2010-08-01Merge branch 'dialog'Bharat Mediratta
2010-08-01"Save" -> "Download" for clarity.Bharat Mediratta
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.