Commit Graph

3624 Commits

Author SHA1 Message Date
Bharat Mediratta
6556ca8833 In GalleryCodeFilterIterator::accept(), ignore . and .., and stop caring about .svn 2010-06-09 21:23:42 -07:00
Bharat Mediratta
aff0f6eca8 Fix get_ancestor_test() since the parameter was renamed to ancestors_for. 2010-06-09 20:55:39 -07:00
Bharat Mediratta
3dacafb718 Revert the "preserve_ids" global query parameter. We decided that it was a
bad idea.

This reverts commit 6425d41edd.
2010-06-09 20:49:32 -07:00
Bharat Mediratta
b40057283e Add a "can_edit" field to the Item_Model's REST output. It's
applicable to the current user.
2010-06-08 20:59:24 -07:00
Tim Almdal
d5b80f2944 Don't use the standard error formatting for exceptions that have occurred as part of a REST request. Format the exception as a json encoded text string so the client can extract the fault information if they so choose. 2010-06-08 14:35:35 -07:00
Tim Almdal
0aafec0e59 The status message for an HTTP 400 status should always be 'Bad Request', if I'm reading the specification right. 2010-06-08 14:32:53 -07:00
Bharat Mediratta
9ec600fd45 Merge branch 'master' of github.com:gallery/gallery3 2010-06-07 23:13:49 -07:00
Bharat Mediratta
6425d41edd Add a "preserve_ids" global query parameter for REST requests that
indicates that we shouldn't opportunistically convert ids into REST
urls.
2010-06-07 23:12:52 -07:00
Bharat Mediratta
98fce83de5 Add a "convert_ids" parameter to Item_Model::as_restful_array(), which
we can turn on with a query parameter.
2010-06-07 22:23:46 -07:00
Bharat Mediratta
5151f0b865 Improve a comment. 2010-06-07 22:18:09 -07:00
Tim Almdal
32241cd143 Merge branch 'master' into talmdal_dev 2010-06-07 07:18:20 -07:00
Tim Almdal
fef5cf9865 If the identity provider changes then delete all the rest user_access_keys, as they are no longer valid. (i.e. all the related users have been deleted.) 2010-06-07 07:09:39 -07:00
Tim Almdal
af240a3498 Update the rest client to use ancestors_for instead of ancestor_for. 2010-06-07 05:25:26 -07:00
Tim Almdal
4a6775f5d3 Merge branch 'master' into talmdal_dev 2010-06-07 05:11:09 -07:00
Bharat Mediratta
1d91e1b2dc Don't show the rotate links if the active user can't edit the photo. Fixes ticket #1157. Thanks to psvo. 2010-06-06 23:19:02 -07:00
Bharat Mediratta
ab0bef14be Try to adjust for situations where /proc/loadavg is_readable() but
generates an error if we call file() on it.  Fixes ticket #1149.
2010-06-06 21:08:10 -07:00
Bharat Mediratta
0c1fb03914 Updated to Exifer 2010-06-06 21:01:36 -07:00
Tim Almdal
097ef934c6 Merge branch 'master' into talmdal_dev 2010-06-06 15:45:03 -07:00
Bharat Mediratta
aeee88031f Fix an unused variable caused by converting straight query params
to $entity based params.
2010-06-06 13:06:08 -07:00
Bharat Mediratta
e1d3b0295d Change "ancestor_for" to "ancestors_for" for consistency. 2010-06-06 12:42:16 -07:00
Bharat Mediratta
4e56176f35 item::random_query() doesn't need to take a "where" clause because
it's returning a query, so the caller can add the where clause
himself.  This makes for a cleaner API.
2010-06-05 23:47:47 -07:00
Bharat Mediratta
87fde3f360 Create a UI under Admin > Settings > Comments where you can limit
comments only to registered users.  It's simplistic, but is better
than adding a permission since generally this setting will be used
Gallery-wide.

Fixes ticket #1002
2010-06-05 23:35:32 -07:00
Bharat Mediratta
10895ca529 Undo the change added in e4eedbce22
which deactivates modules on upgrade.  No idea why we did that, but it
breaks upgrading because it deactivates any module that's been
upgraded.
2010-06-05 23:04:23 -07:00
Bharat Mediratta
0350cf3cd8 Fix a comment typo. 2010-06-05 22:50:20 -07:00
Bharat Mediratta
4603d7010d Merge branch 'master' of github.com:gallery/gallery3 2010-06-05 19:45:44 -07:00
Bharat Mediratta
481ef823dd Add an advanced setting to allow developers to allow guest access to
REST entities.
2010-06-05 19:45:15 -07:00
Tim Almdal
fd437aec2b Correct XSS Security Test golden file for recent changes. Update the controller_auth data file for the rename
of admin_comments to admin_manage_comments.
2010-06-04 14:05:26 -07:00
Tim Almdal
ed1905d3f9 Change the name of the private format_restful_item to _format_restful_item so that the File_Structure_Test will pass. 2010-06-04 14:05:25 -07:00
Tim Almdal
686da5a3e0 Save the item before updating the order of the children. Also always increment the weight count (even if it is equal to the weight of the current child) 2010-06-04 14:05:25 -07:00
Tim Almdal
a600185b60 Allow the use of the type query parameter to filter the results of a rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types.
(cherry picked from commit 3fe10b15cf)
2010-06-04 14:05:24 -07:00
Tim Almdal
04b90c3bde Remove the item id from the rest/gallery/items url as that was inconsistent. Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item.
(cherry picked from commit e9c8a8ae53)

Conflicts:

	modules/gallery/helpers/items_rest.php
2010-06-04 14:05:24 -07:00
Tim Almdal
c4d85721fc Change the rearrange processing to use the ProcessItemQueue when moving children, so a progress dialog is displayed 2010-05-28 16:43:10 -07:00
Tim Almdal
ae595795f0 If the file is empty (i.e. the upload failed, then throw a 'bad request' exception before trying to create the item. 2010-05-28 09:42:44 -07:00
Tim Almdal
56587febff Add a progress dialog box when deleting, uploading or updating items. 2010-05-28 09:42:26 -07:00
Tim Almdal
a1181c5a49 Renamed GalleryRestRequestBuilder to GalleryRestRequest. Refactored the sendRequest method out of the GalleryResource class and moved it to the GalleryRestRequest class. Converted the properties captureDate, updatedDate, and createdDate to return a flex date object instead of a string representing a unix timestamp. 2010-05-21 07:29:17 -07:00
Tim Almdal
e4ff302e3b Add items and add albums are now working. What still needs to be done is add a progress bar for longer running tasks 2010-05-20 09:05:50 -07:00
Tim Almdal
f9cbff9fcc Merge branch 'master' into talmdal_dev 2010-05-20 06:22:47 -07:00
Tim Almdal
ffc3f9f41c checkpoint the new organize module. At this point rearrange and move work. Rearrange is moving items within the same album, move is moving to a different album. 2010-05-18 10:00:48 -07:00
Bharat Mediratta
110350776d Merge branch 'master' of github.com:gallery/gallery3 2010-05-18 09:11:23 -07:00
Tim Almdal
e0b74314dc Merge branch 'master' into talmdal_dev 2010-05-18 06:17:05 -07:00
Tim Almdal
73c7ec5310 Save the item before updating the order of the children. Also always increment the weight count (even if it is equal to the weight of the current child) 2010-05-18 06:16:47 -07:00
Bharat Mediratta
ab204d2720 Rename the admin_comments view to admin_manage_comments to match the controller. 2010-05-16 23:01:57 -07:00
Bharat Mediratta
2157285d9b Rename admin/comments to admin/manage_comments to make room for
admin/comments to be a settings page.
2010-05-16 22:53:19 -07:00
Bharat Mediratta
c682ba86bd Make sure that $item exists in site_menu(). 2010-05-16 22:37:10 -07:00
Tim Almdal
b5b9aeb22c Merge branch 'master' into talmdal_dev
Conflicts:
	modules/gallery/helpers/items_rest.php
2010-05-15 23:45:28 -07:00
Tim Almdal
83ce637ce3 Allow the use of the type query parameter to filter the results of a rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types.
(cherry picked from commit 3fe10b15cf)
2010-05-15 23:43:25 -07:00
Tim Almdal
48b66f2d67 Remove the item id from the rest/gallery/items url as that was inconsistent. Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item.
(cherry picked from commit e9c8a8ae53)

Conflicts:

	modules/gallery/helpers/items_rest.php
2010-05-15 23:42:55 -07:00
Tim Almdal
29a8ba959e Merge branch 'master' into talmdal_dev 2010-05-15 23:36:52 -07:00
Bharat Mediratta
1240878df0 Fix-ups for d98b85f7d3
- Pass the CSS selector of the active image in as an arg to site_menu
  so that quick operations know what they're operating on.
- Change the ids from g-{photo,movie}-id to the generic g-item-id
- Initialize ajax handlers for site menu on the photo and movie page
- Drop the movie context menu, it's now in the site menu
2010-05-14 16:55:15 -07:00
Bharat Mediratta
3422185938 Remove "rnd=" param from quick changes since we have the m= cache-buster already. 2010-05-14 16:51:51 -07:00