summaryrefslogtreecommitdiff
path: root/modules/gallery
AgeCommit message (Collapse)Author
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-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-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 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-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
2010-06-20Add "json" as a valid view suffix.Bharat Mediratta
2010-06-20If we use <?= .. ?> on the last line, it looks like we've got aBharat Mediratta
trailing ?> and that causes File_Structure_Test to be sad. So instead use echo and tack on our own newline. But this also requires a semicolon. Weird, I know but still easier than fixing up the test.
2010-06-19Updated for comment REST relationships.Bharat Mediratta
2010-06-19Rework our exception framework to fit into Kohana's model better.Bharat Mediratta
Instead of overwriting Kohana_Exception::handle() (which we were doing in MY_Kohana_Exception) we instead use their existing template system. gallery/views/kohana/error.php overrides system/views/kohana/error.php and is the standard error template for all exceptions. Our version of error.php figures out the appropriate view based on context (cli, authenticated admin, guest viewing a 404, guest viewing a system error) and delegates appropriately. Each delegated view has a narrow responsibility. This paves the way for us to add new error views per module. For example, the rest module will define its own template in Rest_Exception and then its exceptions can be rendered the way that it wants (json encoded, in that case).
2010-06-19single -> double quotes.Bharat Mediratta
2010-06-18Use request::protocol()Bharat Mediratta
2010-06-18Flip some margin/padding values for RTLmamouneyya
2010-06-17Update the xss gold file with changes to views in the last couple of commits.Tim Almdal
2010-06-17Fix for ticket #1110. Need to use the encode_path with a movie extension to ↵Tim Almdal
find the item. Thanks to samdavidoff for the initial fix.
2010-06-17Fix for ticket #1117 align videos to the center.Tim Almdal
2010-06-17Scale a movie to the resize size so that it doesn't overflow into the sidebar.Tim Almdal
2010-06-16Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2010-06-16Fix issue1068. Fill from_id field in photo with indetificatorJan Koprowski
2010-06-15Revert "Add a "convert_ids" parameter to Item_Model::as_restful_array(), which"Bharat Mediratta
This reverts commit 98fce83de5f772482382bfabdbcd94c25ecdbb1a. Conflicts: modules/gallery/tests/Item_Model_Test.php
2010-06-15Revert "Change the item rest update processing to call theBharat Mediratta
item::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move." Rolling this back for a couple of reasons: 1) Bug in move.php ("message.info" is not a function name) 2) Having the message come back from the API call as a side-effect is sloppy. We should find a cleaner way to do this checking. 3) having item::move() call save() on any changed values in the ORM is counter-intuitive. Move should move, save should save. I think the right approach here is to roll the move() code properly into save(). This reverts commit 2492280cc0ec9eb64a8daeccc7b5698ece7fea66.
2010-06-15Revert "Fix for ticket #1118. Create a item::save_with_retries helperBharat Mediratta
method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly." Rolled this back because it fails KISS. We already have an API for saving models with Item_Model::save() that's consistent with all of our other model code. Adding a new way to save items is confusing and inconsistent. This reverts commit 9504f71efcadc7ed27f6f09e5d663e8025bf3b86.
2010-06-15Make the "name" column a little wider.Bharat Mediratta
2010-06-15Install the rest module by default.Bharat Mediratta
2010-06-15Sort files by path in _dump_var() for consistent output.Bharat Mediratta
Skip . and .. (PHP 5.3 iterators seem to include those now).