summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-31Merge branch 'master' into talmdal_devTim Almdal
2009-12-31Show context menus for movie items. Fix for ticket #960.Bharat Mediratta
2009-12-31A more thorough fix for #745 and #940. Stop using the referer toBharat Mediratta
guess how to send the user back. Instead, proxy the originating item id through the edit forms so that we can tell exactly what page we were on when we began editing. If we were viewing the item, then redirect to its new url (in case it changed) to fix ticket #745. But if we were viewing some other item, then just stay on the current page to fix #940. The page_type approach didn't work because you'd have the same "collection" page_type when doing a context menu edit for an album.
2009-12-31Modify Forge to accept multiple hidden params (this was broken by anBharat Mediratta
API change in K24).
2009-12-31Remove extra debug statement in rest_controller::access_key() and ↵Tim Almdal
restructure the Rest_Tag_Helper_Test to only create items as required for test in each test.
2009-12-31Add quotes to the module nameTim Almdal
2009-12-31Move the set_active_user and normalize_request methods to rest.php helperTim Almdal
2009-12-31Only create the user or the target photo in the tests that require it.Tim Almdal
2009-12-31Create a Rest_Exception class and use it to convey status to the client ↵Tim Almdal
instead of calling rest::forbidden and other rest helper error messages.
2009-12-31Create helper functions to create a test user, an album or image. Don't ↵Tim Almdal
create the test objects in the setup, but do it in each test.
2009-12-31Change the gallery_rest::_validate() method to use the form rules in ↵Tim Almdal
Item_Model. Change the Duplicate errors to sentence case. And generally clean up the flow in _validate().
2009-12-301) Remove the rest::not_found method and replace it with "throw new ↵Tim Almdal
Kohana_404_Exception 2) Don't use the input path to lookup the item via relative_path_cache. Instead use url::get_item_from_uri method.
2009-12-30Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-12-30Rollback the refactoring of the update into a helper method. Also remove the ↵Tim Almdal
refactoring for check for commits
2009-12-30Merge branch 'master' into talmdal_devTim Almdal
2009-12-30The problem occurs because the square brackets are treated as special ↵Tim Almdal
characters in the glob to find the children. This patch escapes the square brackets. Fixes ticket #855
2009-12-30whitespace.Bharat Mediratta
2009-12-30Force the 'Select Photos...' button to always be in the center of the upload ↵Tim Almdal
dialog with the flash object overtop of it. Fixes ticket: #908.
2009-12-30Change the file proxy to use the expires helper to manage content ↵Tim Almdal
expiration. Fixes ticket #953.
2009-12-30Merge branch 'master' into talmdal_devTim Almdal
2009-12-29Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-12-29Another holdover from the K2.4 conversion. In R2.4 the url::current(true) ↵Tim Almdal
was returning an empty string. This fixes ticket #955.
2009-12-29Found another where statement that required convertingTim Almdal
2009-12-29Make sure that we have the mbstring extension.Bharat Mediratta
2009-12-29Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-12-29Make sure that we have the mbstring extension.Bharat Mediratta
2009-12-28Merge branch 'master' into talmdal_devTim Almdal
2009-12-27Allow users to upscale images in the slideshow by making the maxScaleBharat Mediratta
parameter configurable in Admin > Settings > Advanced. You specify the scaling factor. Normally, images fill the stage; 0 -> never scale up; any other positive number S --> scale up to S times the original size of the photo (but never bigger than the stage)
2009-12-27Only mark a variable as empty if its value is null. So 0 shows as 0.Bharat Mediratta
2009-12-27Fix a bug where we weren't replacing table names when there's noBharat Mediratta
prefix. This is wrong because even when there's no prefix we have to get rid of the {curly} braces.
2009-12-27Merge branch 'master' into talmdal_devTim Almdal
2009-12-27Change ->in(...) ->where('id', 'in', ...)Tim Almdal
2009-12-27Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/organize/js/organize.js
2009-12-27Clean up validation the check for duplicate names or slugs, finish ↵Tim Almdal
converting the rest API to Kohana 2.4
2009-12-26Fix the scrollbar in the organize panel by restricting drag-to-select to ↵Bharat Mediratta
#g-organize-microthumb-grid.
2009-12-26Roll forward to the new CoolIris slideshow -- it appears to be readyBharat Mediratta
now.
2009-12-26Reuse $theme->item() for our descendants_count() call.Bharat Mediratta
2009-12-26Forgot to commit local changes to item helper for K2.4Tim Almdal
2009-12-26Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/controllers/albums.php modules/gallery/controllers/movies.php modules/gallery/controllers/photos.php
2009-12-26For some reason this wasn't a clean merge, probably because of line endings.Tim Almdal
2009-12-25Prevent form::dropdown from overzealously escaping ampersands by applying ↵Bharat Mediratta
this diff: http://dev.kohanaframework.org/attachments/1490/form.diff Upstream ticket: http://dev.kohanaframework.org/issues/2463
2009-12-25Fix over-targetting in CSSBharat Mediratta
2009-12-25Convert some database callsBharat Mediratta
2009-12-25Fix uses of count_records() and use ORM to count instead.Bharat Mediratta
2009-12-24indentation fix.Bharat Mediratta
2009-12-24Add the functionality to add, delete and rename tags via the Gallery3 remote ↵Tim Almdal
interface.
2009-12-24Update the gallery_rest handlers test to pass the path in as an array in the ↵Tim Almdal
request arguments property instead of the path property.
2009-12-24whitespace fixBharat Mediratta
2009-12-24Change the image block rest handler to expect the type (i.e. random) as a ↵Tim Almdal
parameter not part of the path.
2009-12-24Don't treat objects like strings.Bharat Mediratta