Commit Graph

2805 Commits

Author SHA1 Message Date
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
bff7b393ec Stop checking the exact nature of all grups after install. It doesn't add any value. 2010-01-02 14:02:41 -08:00
Bharat Mediratta
183e65210a Verified and updated. 2010-01-02 14:00:28 -08:00
Bharat Mediratta
b3023493f4 Clean the G2 base url so that we can't leak XSS vulnerabilities that
way (highly unlikely, but now it's impossible).
2010-01-02 14:00:00 -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
1544bea535 Add a tip about deactivating some modules to make importing faster.
Combine two tips into one.
2010-01-02 12:46:28 -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
0be0111b74 Remove an obsolete todo. 2010-01-01 22:11:08 -08:00
Bharat Mediratta
c3075d8181 Add a code block showing how to add a mod_rewrite block to the old Gallery2 install to redirect urls to Gallery 3. 2010-01-01 21:58:07 -08:00
Bharat Mediratta
80e35affcb Improve the PHPdoc for map()
We now expect to either get query parameters from the Gallery2 url so
we can pick off g2_itemId, or we'll get the rewrite url in the path
query param.
2010-01-01 21:56:29 -08:00
Bharat Mediratta
161366e51d New controller for remapping Gallery 2 urls to Gallery 3 urls. 2010-01-01 21:02:52 -08:00
Bharat Mediratta
6d5d68a3f9 Start tracking the original G2 url and id for all entities. This will
allow us to map G2 image urls to the appropriate G3 ones.
2010-01-01 17:41:20 -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
40d496edee Remove extra debug statement in rest_controller::access_key() and restructure the Rest_Tag_Helper_Test to only create items as required for test in each test. 2009-12-31 13:24:00 -08:00
Tim Almdal
0bb13da25a Add quotes to the module name 2009-12-31 12:47:18 -08:00
Tim Almdal
4611eb2142 Move the set_active_user and normalize_request methods to rest.php helper 2009-12-31 12:32:54 -08:00
Tim Almdal
af10f0abcf Only create the user or the target photo in the tests that require it. 2009-12-31 12:24:46 -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
e6111e616b Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev 2009-12-30 16:13:13 -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
7af844606d The problem occurs because the square brackets are treated as special characters in the glob to find the children. This patch escapes the square brackets. Fixes ticket #855 2009-12-30 15:33:22 -08:00
Bharat Mediratta
5d6e264211 whitespace. 2009-12-30 12:07:24 -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
7e8985d0e8 Found another where statement that required converting 2009-12-29 15:26:18 -08:00
Tim Almdal
5925e586ba Merge branch 'master' into talmdal_dev 2009-12-28 11:27:43 -08:00
Bharat Mediratta
38f2784fbb Allow users to upscale images in the slideshow by making the maxScale
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-27 13:40:38 -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
31bb09c9b6 Change ->in(...) ->where('id', 'in', ...) 2009-12-27 12:10:37 -08:00
Tim Almdal
0a482127b2 Merge branch 'master' into talmdal_dev
Conflicts:
	modules/organize/js/organize.js
2009-12-27 08:35:19 -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
Bharat Mediratta
55f9408d50 Fix the scrollbar in the organize panel by restricting drag-to-select to #g-organize-microthumb-grid. 2009-12-26 15:08:14 -08:00