stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 11:29:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,772 Commits 4 Branches 0 Tags
ed704e6a3bcd24c9d0ffbc4e71d2441aba4e9d0b
Commit Graph

5772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta
ed704e6a3b Trap 404s and return Rest_Exception instead. Fixes ticket #1213. 2010-07-16 12:16:20 -07:00
Bharat Mediratta
5fd166724b Merge branch 'master' of github.com:gallery/gallery3 2010-07-16 11:59:48 -07:00
Bharat Mediratta
583950616e Improve the fix for #1176 to use request::is_ajax() instead of tacking 
on a query param to urls that appear in dialogs.  This keeps things simpler.
 2010-07-16 11:58:13 -07:00
Tim Almdal
bd969a6ffa Fix for ticket #1202. Set the minimum flash version 10.0.0 and display a message and a button to download the latest version if the minimum versiion is not installed. 2010-07-16 07:37:24 -07:00
Tim Almdal
ce2b3d0001 Remove code that was inadvertently committed. 2010-07-16 06:52:18 -07:00
Bharat Mediratta
b51b49cb63 Don't show a themed 404 page if we get to a 404 via file_proxy. Just 
return a simple "File not found" message, since this is a very basic
file access (thumbnail, resize, original etc)
 2010-07-15 19:45:10 -07:00
Tim Almdal
993e041274 Remove the code to call the controller directly and just use redirect. Now that all the form calls actually return the form as a json object, calling the form creation controller method i no longer required. 2010-07-15 14:57:43 -07:00
Tim Almdal
155d2b809b Rename g-in-dialog to the naming standard for query parameters and give it something more representative... 'gallery_dialog_request' 2010-07-15 14:54:45 -07:00
Bharat Mediratta
86a91c11cf Redirect users away from admin to the main site if you click logout on 
the admin dashboard.

Fixes ticket #1201
 2010-07-15 12:51:35 -07:00
Bharat Mediratta
fe2881a22a Rename Flash_Uploader to just Uploader. Modules that want to replace 
this will just replace the controller.  This makes overriding that
much easier in the future.
 2010-07-15 12:37:44 -07:00
Bharat Mediratta
8065ab023d Revert "Fix for ticket #1182. Remove the trailing slash and just let it be matched by the trailing (.*) group" 
This breaks adding new albums.  I get the following in my error log:

"2010-07-13 13:08:46 -07:00 --- error: Kohana_404_Exception [ 43 ]: The page you requested, form/add/albums/1?type=album&g-in-dialog, could not be found."

This reverts commit cb4e18f9dd.
 2010-07-13 13:42:00 -07:00
Bharat Mediratta
297f98fcee Fix reauth authentication to use the identity helper instead of the 
user helper directly.  Else it doesn't work with LDAP and other
identity systems.
 2010-07-13 12:52:59 -07:00
Bharat Mediratta
887154a3b7 Merge branch 'master' of github.com:gallery/gallery3 2010-07-13 12:30:03 -07:00
Bharat Mediratta
5eb4b8ff6c Check for the existence of uploadify() in the add_photos_form. The HTML uploader won't have that field. 2010-07-13 12:16:52 -07:00
Tim Almdal
69dfb51490 Merge branch 'master' into talmdal_dev 2010-07-12 21:50:09 -07:00
ckieffer
b7cc677c3d Indentation fixes. 2010-07-11 12:07:50 -06:00
ckieffer
9c9c0879c2 Indentation fixes. 2010-07-11 11:58:41 -06:00
Tim Almdal
329abfe539 Merge branch 'master' into talmdal_dev 2010-07-11 09:09:52 -07:00
Bharat Mediratta
0389dceb47 Rotate all matching album covers when we rotate an item. Fixes ticket #1200. 2010-07-10 21:29:34 -07:00
Bharat Mediratta
eb19192c4e If the target of an item move has no album cover, make the newly moved item the album cover. 
Fixes ticket #1196.
 2010-07-10 18:51:57 -07:00
Bharat Mediratta
b20f9123dc Wrap album deletes in a batch so that we can handle lots of cascading 
deletes in bulk.  This lets us avoid the problem where we continually
choose and delete album covers which makes deletes really slow.  It
probably also avoids huge amounts of notification emails (untested).

Fixes ticket #1190.
 2010-07-10 18:25:23 -07:00
Bharat Mediratta
b7cd2f73c5 PHPDoc fix. 2010-07-10 15:18:54 -07:00
Bharat Mediratta
0a42d74d55 Reset the time limit to 30 seconds every time we delete a child. Fixes ticket #1199. 2010-07-10 15:10:20 -07:00
Bharat Mediratta
ab6025f71a Replace … with … 
UTF-8 symbols are much more tractable with filters like HTML escaping.

Follow-on fix to ticket #1184.
 2010-07-10 14:31:29 -07:00
Bharat Mediratta
fe8cb89ac4 Cast the status message to a string so that it gets sent down as a string in the json blob. 
Fixes ticket #1198.
 2010-07-10 14:03:46 -07:00
Bharat Mediratta
7ca201b118 Pass along the from_id in item::get_delete_form() and then check to 
see if we're deleting the album we're inside in quick::delete.  If we
delete the album we're currently viewing, redirect to the parent.

This fixes ticket #1185.
 2010-07-10 12:00:06 -07:00
Bharat Mediratta
307e47c3d0 Pass along the from_id when editing albums in the context menu, and 
also pass it along in the form creation code.  This fixes ticket #1183.
 2010-07-10 11:45:45 -07:00
Bharat Mediratta
4c77f9ebde When limiting the length of album titles, purify after truncating so 
that the truncation happens on entity boundaries.  Fixes ticket #1184.
 2010-07-10 08:34:08 -07:00
Romain LE DISEZ
39962eaddc Accept extension .m4v as video/mp4 2010-07-10 08:09:04 -07:00
Tim Almdal
213807a807 remove debugging statement 2010-07-09 14:59:23 -07:00
Tim Almdal
f26d5dbbdf Reset the title in case the dialog contents changed the dialog title. 2010-07-09 11:10:02 -07:00
Tim Almdal
591c5a11a3 Reset the postion option to center when the form data is reloaded, to force the dialog to recenter in case the contents have changed. 2010-07-09 11:09:35 -07:00
Tim Almdal
72f801df7d Only add the 'Successfully re-authenticated' message to the status if the admin page is not displayed in a dialog. 2010-07-08 08:23:08 -07:00
Tim Almdal
9538b3888d Fix for ticket #1176. Have the gallery.dialog code add a g-in-dialog parameter to the url to let the controller know its in a dialog. The reauthenticate controller will format the password prompt as a page or a form content. If authentication is successful, then the original controller is called instead of being redirected to. 2010-07-07 08:58:38 -07:00
Tim Almdal
cb4e18f9dd Fix for ticket #1182. Remove the trailing slash and just let it be matched by the trailing (.*) group 2010-07-06 14:59:27 -07:00
Tim Almdal
dbf3199e46 Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers 
that create the data to go into a dialog to return the html as part of a json object.
 2010-07-06 14:12:01 -07:00
Tim Almdal
9d66783f47 Update the xss golden file 2010-07-06 09:48:37 -07:00
Tim Almdal
eee8c27f26 Correct the controller auth golden file from when the simple_uploader was renamed to flash_uploader 2010-07-06 08:43:02 -07:00
Bharat Mediratta
1d40c62f53 Updated version for RC2 2010-07-05 19:46:19 -07:00
Bharat Mediratta
df3af7d521 Merge branch 'master' of github.com:gallery/gallery3 2010-07-05 19:17:30 -07:00
Tim Almdal
67223fc43d Revert "Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match" 
This reverts commit e4d397d301.
 2010-07-05 08:59:08 -07:00
Tim Almdal
226d1f7146 Revert "If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog." 
This reverts commit 8493a3d36f.
 2010-07-05 08:58:36 -07:00
Bharat Mediratta
0977c31009 Merge branch 'master' of github.com:gallery/gallery3 2010-07-05 08:47:40 -07:00
Bharat Mediratta
45b210c287 Add maessage when we automatically log you out of the admin area. 2010-07-05 08:44:46 -07:00
Tim Almdal
8493a3d36f If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog. 2010-07-05 08:23:17 -07:00
Tim Almdal
e4d397d301 Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match 2010-07-05 08:21:14 -07:00
Bharat Mediratta
60126adc7e In the site menu, say "Delete album", "Delete photo" or "Delete movie" 
as appropriate for the item type.  Fixes ticket #1175.
 2010-07-04 20:40:50 -07:00
Bharat Mediratta
0d424a635d When we delete an item, make sure that we scrub it from any other 
items that may have it in the album_cover_item_id column.  Fixes ticket #1172.
 2010-07-03 14:25:33 -07:00
Bharat Mediratta
3feb561054 Internationalize the "Gallery 2 path saved." message and remove the trailing period. Fixes ticket #1171. 2010-07-03 11:40:56 -07:00
Bharat Mediratta
ca444a9565 Updated for RC2 2010-06-30 20:17:59 -07:00