stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-01 04:31:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph
2269 Commits
Author SHA1 Message Date
Bharat Mediratta b61b50604b Push the continue url into the form for consistency with other 
login/continue code.
 2010-06-12 15:09:16 -07:00
Bharat Mediratta 63d95087bf Stop trying to parse the continue url in the logout controller because 
it requires us to reproduce a bunch of complex routing logic.
Instead, just have the logout link generating code generate a link
that's visible to guests.
 2010-06-12 13:35:12 -07:00
Bharat Mediratta a4586bc0c0 Revert "Fix for ticket #1118. The item validation was flagging duplicate slugs as errors. There was already code in the item save to insure that any" 
This introduces a bug where you can create two items with the same slug.

This reverts commit cb01f4017d.
 2010-06-12 13:05:40 -07:00
Tim Almdal cb01f4017d Fix for ticket #1118. The item validation was flagging duplicate slugs as errors. There was already code in the item save to insure that any 
duplicates were made unique, so this patch removes the validation as unnecessary.
 2010-06-11 16:37:45 -07:00
Tim Almdal bbbb35675a Fix for ticket #1039. The problem was, as Bryan76 pointed out, with passing the full url in the continue parameter. In the logout controller, we tried to get the item from the url so we could check the permission of the item to insure that the guest user had access. But url::get_item_from_url expects a relative url. 2010-06-11 15:40:54 -07:00
Tim Almdal 30f4e143e8 Actually execute the database query that updates the album view count. Fixes ticket #1092. Thanks to shinta for pointing the way. 2010-06-11 08:17:03 -07:00
Tim Almdal 0ebc36b4e5 Actually execute the database query that updates the album view count. Fixes ticket #1092. Thanks to shinta for pointing the way. 2010-06-11 08:15:25 -07:00
Tim Almdal 58b21e909d Change the pattern used to convert the file name to a title. Fixes ticket#1061 2010-06-10 18:49:29 -07:00
Tim Almdal 6119ddc735 Merge branch 'master' into talmdal_dev 2010-06-10 08:16:07 -07:00
Bharat Mediratta ab93767e4d Update golden file 2010-06-09 21:26:36 -07:00
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
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
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
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 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
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 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 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
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
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
Chad Kieffer 163dd0eb93 Merge branch 'master' of github.com:gallery/gallery3 2010-05-14 17:16:22 -06:00
ckieffer d98b85f7d3 Drop context_menu for wind's photo/resize view. Move photo edit options to the site_menu. 2010-05-14 17:14:34 -06:00
Bharat Mediratta 9affa8ebbd Pick a new album cover when the photo that's the current cover is 
deleted.  Fixes ticket #1083.
 2010-05-10 22:11:59 -07:00
ckieffer 44753c5249 Deleted extra CSS class assignment for context_menu delete option. 2010-05-08 15:05:56 -06:00
Andy Staudacher d849b6be3f Oops, somehow the update to flowplayer 3.1.5 was missing a few files. Here they are... 2010-04-30 16:25:16 -07:00
ckieffer f1076590f1 Add page_title to admin views. Closes #1038. 2010-04-30 00:08:37 -06:00
Bharat Mediratta 4068e80f06 Update test to reflect slug change in 78db1bb339 2010-04-22 22:24:44 -07:00
Bharat Mediratta 2257776f9b Don't show the member element for non-collection elements in the response. Having a members sidebar element indicates to the rest clients that this is a resource collection. 
Conflicts:

	modules/gallery/helpers/items_rest.php
 2010-04-17 15:36:46 -07:00
Bharat Mediratta af71df3d0f Update tests to reflect recent changes to the REST API. 2010-04-17 15:35:09 -07:00
Bharat Mediratta 10f849cd0a Merge branch 'master' into bharat_dev 2010-04-17 12:33:18 -07:00
Bharat Mediratta 6d81feacae Change the key for invalid passwords from "invalid" to 
"invalid_password" to remove ambiguity.
 2010-04-17 12:28:46 -07:00
Bharat Mediratta b4d1a5686c Merge branch 'master' into bharat_dev 2010-04-17 12:10:13 -07:00
Bharat Mediratta ca45341361 Trigger the album_add_form_completed event after creating a new album. 2010-04-17 12:10:01 -07:00