summaryrefslogtreecommitdiff
path: root/modules
AgeCommit message (Collapse)Author
2010-07-10Pass along the from_id in item::get_delete_form() and then check toBharat Mediratta
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-10Pass along the from_id when editing albums in the context menu, andBharat Mediratta
also pass it along in the form creation code. This fixes ticket #1183.
2010-07-10Accept extension .m4v as video/mp4Romain LE DISEZ
2010-07-09remove debugging statementTim Almdal
2010-07-09Reset the postion option to center when the form data is reloaded, to force ↵Tim Almdal
the dialog to recenter in case the contents have changed.
2010-07-08Only add the 'Successfully re-authenticated' message to the status if the ↵Tim Almdal
admin page is not displayed in a dialog.
2010-07-08Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2010-07-07Fix for ticket #1176. Have the gallery.dialog code add a g-in-dialog ↵Tim Almdal
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-06Fix for ticket #1182. Remove the trailing slash and just let it be matched ↵Tim Almdal
by the trailing (.*) group
2010-07-06Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the ↵Tim Almdal
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-06Update the xss golden fileTim Almdal
2010-07-06Correct the controller auth golden file from when the simple_uploader was ↵Tim Almdal
renamed to flash_uploader
2010-07-05Updated version for RC2Bharat Mediratta
2010-07-05Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-07-05Revert "Make the trailing slash on the url optional. Sometimes it is not ↵Tim Almdal
there, so the regex doesn't match" This reverts commit e4d397d30118a3d673b146c44ed329efa08bbefe.
2010-07-05Revert "If the admin request originates as a dialog link, don't display the ↵Tim Almdal
entire page when reauthenticating the administrator. Just put the form in the dialog." This reverts commit 8493a3d36f597e183490ae880b35a3d98f50a045.
2010-07-05Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-07-05Add maessage when we automatically log you out of the admin area.Bharat Mediratta
2010-07-05If the admin request originates as a dialog link, don't display the entire ↵Tim Almdal
page when reauthenticating the administrator. Just put the form in the dialog.
2010-07-05Make the trailing slash on the url optional. Sometimes it is not there, so ↵Tim Almdal
the regex doesn't match
2010-07-04In the site menu, say "Delete album", "Delete photo" or "Delete movie"Bharat Mediratta
as appropriate for the item type. Fixes ticket #1175.
2010-07-03When we delete an item, make sure that we scrub it from any otherBharat Mediratta
items that may have it in the album_cover_item_id column. Fixes ticket #1172.
2010-07-03Internationalize the "Gallery 2 path saved." message and remove the trailing ↵Bharat Mediratta
period. Fixes ticket #1171.
2010-06-27When detecting encodings, give priority to ISO-8859-1 which seems toBharat Mediratta
solve the umlaut problem in IPTC data. Fixes ticket #1144.
2010-06-27Fix the autocomplete callback in item_edit_form(). We wereBharat Mediratta
incorrectly matching the form input in the jQuery selector. Did this ever work? Fixes ticket #1168
2010-06-26Style cleanup.Bharat Mediratta
2010-06-26Sentence casing.Bharat Mediratta
2010-06-26Differentiate in our logs between missing site and admin theme overrides.Bharat Mediratta
2010-06-26Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-06-25Better fix for the problem that a preview of an admin theme was not showing up.Tim Almdal
2010-06-25Fix an issue where a preview of the admin view would not work.Tim Almdal
2010-06-25Add a <h1> title saying that this is a preview.Bharat Mediratta
2010-06-25Change the theme option page to display using tabs if the site theme has an ↵Tim Almdal
admin page.
2010-06-23centerize the group labels in Edit Permission window.. i think it's much ↵mamouneyya
cleaner this way
2010-06-211) revert e468ed7bd3f1e29b267e3902ef9c91273787d58fTim Almdal
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-20Rename "simple_uploader" to "flash_uploader" to make room for an HTMLBharat Mediratta
uploader.
2010-06-20Rename "children" to "items" in our feed view because it makes moreBharat Mediratta
semantic sense.
2010-06-20Rename the feed variable from "children" to "comments" since thatBharat Mediratta
makes more semantic sense.
2010-06-20Set the focus on the username field (and the name field when we resetBharat Mediratta
the password) properly on IE7 using a setTimeout() hack. Fixes ticket #807.
2010-06-20Focus on the username field by default.Bharat Mediratta
2010-06-20Add "Tag: %s" in the title on tag pages. Fixes ticket #1097.Bharat Mediratta
2010-06-20Add a loading indicator to the delete form by tagging some JS on atBharat Mediratta
the end which triggers .gallery_show_loading(). Not a complete fix for #817 but it's a start and it takes care of one place where we have a long running process.
2010-06-20Oops. Remove debug line.Bharat Mediratta
2010-06-20Simplify the descendent logic. viewable() already joins with theBharat Mediratta
items table so there's no need for a subquery. The subquery could generate way too many ids since it didn't pay attention to permissions. This isn't a security problem since we were restricting the item ids according to permissions in the outer query, but it's wasteful.
2010-06-20Merge branch 'master' of git://github.com/mamouneyya/gallery3Bharat Mediratta
Conflicts: lib/gallery.common.css
2010-06-20Updated golden files.Bharat Mediratta
2010-06-20Add "comments" relationship support.Bharat Mediratta
2010-06-20Assert how many files we analyze so that we can tell if we're suddenlyBharat Mediratta
analzying too many or too few.
2010-06-20Exclude the .git directory.Bharat Mediratta
2010-06-20Remove trailing ?>Bharat Mediratta