stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,803 Commits 4 Branches 0 Tags
058a84ed76df96aeb6ec082d16fe0d8f317faac2
Commit Graph
1146 Commits
Author SHA1 Message Date
Bharat Mediratta 1cab4221ab Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-04 21:38:39 -08:00
Bharat Mediratta 6b8a52d328 Fix the logout link to send you back to the current url. The old 
approach depended on having an $item, which is not the case on all
pages (eg: tag pages).  Also, check the CSRF in the logout controller,
else you can use the logout link as a blind forwarder.
 2010-01-04 21:37:51 -08:00
Tim Almdal 8ae0d4c196 Change uppercase NULL to lowercase null to match the gallery3 style guide 2010-01-04 13:00:15 -08:00
Tim Almdal bfcd4efe92 Another K2.4 holder over... We had, when checking for position, ->where(, "=", NULL) which would never find any. It should have been ->where(, "is", NULL) 2010-01-04 12:39:48 -08:00
Tim Almdal cbf9754922 Send an empty Pragma header and use the item-updated time in the last-modified header 2010-01-04 09:10:12 -08:00
Tim Almdal 64e5efd57b Add rest_controller::__call to the authorized controller methods 2010-01-02 17:09:40 -08:00
Tim Almdal 5b9801092b Remove the Rest_Exception::trigger method. 2010-01-02 16:55:06 -08:00
Tim Almdal 07f8e256cf Clean up gallery_rest helper test 2010-01-02 16:22:03 -08:00
Bharat Mediratta 11f6a3d1eb Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 15:49:17 -08:00
Bharat Mediratta bad83900ae Fix two issues with change_album_test() 
1) We do support changing the name.
2) Choose a random name to avoid conflicts.
 2010-01-02 15:48:58 -08:00
Tim Almdal d4ad81e657 Correct unexpected error in gallery_rest_put_album_no_path_test 2010-01-02 15:04:43 -08:00
Bharat Mediratta 681613ac9e Fix up tabs, leading <?php. 2010-01-02 14:52:10 -08:00
Bharat Mediratta 7369c68ddd Ignore modules/gallery/views/kohana/error.php -- we're required to have that name by Kohana_404_Exception. 2010-01-02 14:47:59 -08:00
Bharat Mediratta 3ceb0d57ba Update the expected response after modifying an album to match the 
change I made in 20bd09ff00
 2010-01-02 14:37:51 -08:00
Bharat Mediratta 7c03644777 Update the expected response after modifying an album to match the 
change I made in 20bd09ff00
 2010-01-02 14:33:31 -08:00
Tim Almdal 28597ba533 Correct file structure tests, Have the tests delete the userid they create so as not to impact other tests. 2010-01-02 14:31:59 -08:00
Bharat Mediratta 183e65210a Verified and updated. 2010-01-02 14:00:28 -08:00
Bharat Mediratta 8e4c48837c Verified and updated. 2010-01-02 13:56:01 -08:00
Bharat Mediratta 14b0ab08b4 Update the expected response after modifying an album to match the 
change I made in 20bd09ff00
 2010-01-02 13:53:01 -08:00
Bharat Mediratta 4ab2400d18 Add a cache buster to the resize and file urls. This fixes ticket 2010-01-02 13:47:28 -08:00
Bharat Mediratta e413cb3011 Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 12:53:56 -08:00
Bharat Mediratta f65794785a Take precautions against deleting var/albums, var/thumbs or var/resizes. 
Fixes ticket #916.
 2010-01-02 10:51:47 -08:00
Tim Almdal 77cabb056f Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 08:42:14 -08:00
Tim Almdal 1b3d20a0fb Correct formatting in the uploadify dialog box for safari. 2010-01-02 08:42:06 -08:00
Bharat Mediratta df001700dd Don't enable the rest module by default yet; we should make sure that 
we do a more thorough security audit on it first.
 2010-01-01 12:17:04 -08:00
Tim Almdal c4ba5b6f65 Correct the sql so that the guest and admin passwords are actually blanked as part of the export 2010-01-01 09:54:10 -08:00
Tim Almdal ee1a032e4d Merge branch 'master' into talmdal_dev 2009-12-31 18:32:24 -08:00
Bharat Mediratta 20bd09ff00 A more thorough fix for #745 and #940. Stop using the referer to 
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-31 17:21:19 -08:00
Bharat Mediratta a018e6235f Modify Forge to accept multiple hidden params (this was broken by an 
API change in K24).
 2009-12-31 15:49:43 -08:00
Tim Almdal 1a12a5e3c8 Create a Rest_Exception class and use it to convey status to the client instead of calling rest::forbidden and other rest helper error messages. 2009-12-31 11:51:51 -08:00
Tim Almdal 732047e9c3 Create helper functions to create a test user, an album or image. Don't create the test objects in the setup, but do it in each test. 2009-12-31 09:56:41 -08:00
Tim Almdal 4b44600bf9 Change the gallery_rest::_validate() method to use the form rules in Item_Model. Change the Duplicate errors to sentence case. And generally clean up the flow in _validate(). 2009-12-31 09:01:49 -08:00
Tim Almdal 11792a12bb 1) Remove the rest::not_found method and replace it with "throw new 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-30 17:08:01 -08:00
Tim Almdal d6ddbd1a31 Rollback the refactoring of the update into a helper method. Also remove the refactoring for check for commits 2009-12-30 16:12:32 -08:00
Tim Almdal d50b753199 Merge branch 'master' into talmdal_dev 2009-12-30 15:52:18 -08:00
Tim Almdal 399c5c21f6 Force the 'Select Photos...' button to always be in the center of the upload dialog with the flash object overtop of it. Fixes ticket: #908. 2009-12-30 11:47:34 -08:00
Tim Almdal 55eeb8336f Change the file proxy to use the expires helper to manage content expiration. Fixes ticket #953. 2009-12-30 09:55:28 -08:00
Tim Almdal 2e98825c25 Merge branch 'master' into talmdal_dev 2009-12-30 07:57:23 -08:00
Tim Almdal 41969cc9e4 Another holdover from the K2.4 conversion. In R2.4 the url::current(true) was returning an empty string. This fixes ticket #955. 2009-12-29 15:48:21 -08:00
Tim Almdal 5925e586ba Merge branch 'master' into talmdal_dev 2009-12-28 11:27:43 -08:00
Bharat Mediratta 754c531c7e Only mark a variable as empty if its value is null. So 0 shows as 0. 2009-12-27 13:37:39 -08:00
Bharat Mediratta fc5d1e5d74 Fix a bug where we weren't replacing table names when there's no 
prefix.  This is wrong because even when there's no prefix we have to
get rid of the {curly} braces.
 2009-12-27 12:41:52 -08:00
Tim Almdal bccb6fc021 Clean up validation the check for duplicate names or slugs, finish converting the rest API to Kohana 2.4 2009-12-27 08:32:12 -08:00
Tim Almdal 07e83718a0 Forgot to commit local changes to item helper for K2.4 2009-12-26 11:26:44 -08:00
Tim Almdal 3060a6f662 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
 2009-12-26 11:24:50 -08:00
Bharat Mediratta 73aeed8902 indentation fix. 2009-12-24 20:08:04 -08:00
Tim Almdal 4268889fbf Update the gallery_rest handlers test to pass the path in as an array in the request arguments property instead of the path property. 2009-12-24 19:24:22 -08:00
Bharat Mediratta 24ef52eccb whitespace fix 2009-12-24 18:06:26 -08:00
Bharat Mediratta 057e8d09af Convert a bunch of leftover kohana::show_404 calls to throw 
Kohana_404_Exception instead.  These are the ones where we used a
lower-case 'k' so my previous filter didn't catch it.
 2009-12-23 20:51:33 -08:00
Bharat Mediratta b62083bd24 Cleaner version. Probably has a bunch of cruft in it, but it looks good enough. 2009-12-23 20:48:50 -08:00