stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-20 22:05:22 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,764 Commits 4 Branches 0 Tags
86a91c11cf8e2af8d100ee8a982a299d341ef032
Commit Graph
3686 Commits
Author SHA1 Message Date
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 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 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
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 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 f75ce45b6b When detecting encodings, give priority to ISO-8859-1 which seems to 
solve the umlaut problem in IPTC data.  Fixes ticket #1144.
 2010-06-27 12:14:56 -07:00
Bharat Mediratta 5335e4c0b4 Fix the autocomplete callback in item_edit_form(). We were 
incorrectly matching the form input in the jQuery selector.  Did this
ever work?  Fixes ticket #1168
 2010-06-27 11:25:31 -07:00
Bharat Mediratta e5ae2c91bc Style cleanup. 2010-06-26 12:14:02 -07:00
Bharat Mediratta 5767971f43 Sentence casing. 2010-06-26 12:00:55 -07:00
Bharat Mediratta 6b619e1098 Differentiate in our logs between missing site and admin theme overrides. 2010-06-26 12:00:14 -07:00
Bharat Mediratta 87d09bcd2e Merge branch 'master' of github.com:gallery/gallery3 2010-06-26 11:57:18 -07:00
Tim Almdal 8ecf28d3ef Better fix for the problem that a preview of an admin theme was not showing up. 2010-06-25 10:23:11 -07:00
Tim Almdal e380f19ee2 Fix an issue where a preview of the admin view would not work. 2010-06-25 10:17:06 -07:00
Bharat Mediratta 8bc7eec60f Add a <h1> title saying that this is a preview. 2010-06-25 09:56:44 -07:00
Tim Almdal d66c496fb1 Change the theme option page to display using tabs if the site theme has an admin page. 2010-06-25 06:45:09 -07:00
mamouneyya ca09e98890 centerize the group labels in Edit Permission window.. i think it's much cleaner this way 2010-06-23 23:33:13 +08:00
Tim Almdal a804c11513 1) revert e468ed7bd3 
2) Add the padding to both the button and flash object so they always line up
3) Add some top padding to the uploadifyQueue panel  to seprate it from the button.
 2010-06-21 10:11:38 -07:00
Bharat Mediratta d82863421d Rename "simple_uploader" to "flash_uploader" to make room for an HTML 
uploader.
 2010-06-20 21:10:22 -07:00
Bharat Mediratta 48af5e6b50 Rename "children" to "items" in our feed view because it makes more 
semantic sense.
 2010-06-20 17:25:23 -07:00
Bharat Mediratta 74e821b03e Rename the feed variable from "children" to "comments" since that 
makes more semantic sense.
 2010-06-20 17:21:25 -07:00