stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-26 09:43:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta c2615e87a7 Merge branch 'master' into bharat_dev 2010-04-16 14:19:21 -07:00
Tim Almdal 009b47262b Only return the members element to the rest client if the item is an album. This makes it consistent to the rest client that collections will have a members element. 2010-04-15 06:18:47 -07:00
Tim Almdal c58b2aaf88 Merge branch 'master' into talmdal_dev 2010-04-15 05:22:30 -07:00
Bharat Mediratta 8d8aefc5b8 Add album_add_form event to album::get_add_form(). 2010-04-10 20:58:05 -07:00
Bharat Mediratta 886337e1dd Add error messages to theme::get_edit_form_admin() 2010-04-10 20:45:09 -07:00
Bharat Mediratta c9edb943f9 Fix a bug introduced when we patched the "disallowed global data" 
security check.  Not sure why the patch worked for some and not for
others, but this should resolve it either way.  Fixes ticket #1123.
 2010-04-10 17:01:48 -07:00
Tim Almdal 9bb4c954bb Merge bharat_dev rest implementation 2010-04-07 08:07:41 -07:00
Tim Almdal 6652b69193 Merge branch 'master' into bharat_dev 2010-04-07 07:29:46 -07:00
Tim Almdal 50b0b73345 Merge branch 'master' into talmdal_dev 2010-04-06 06:08:17 -07:00
Bharat Mediratta 2657d08586 Move the "Fix MPTT" task from the rescue module into the main Gallery 
module.
 2010-04-04 14:46:44 -07:00
Bharat Mediratta c82d24d475 preg_quote() the pattern we use for directory globs to avoid letting 
the filename be treated as a regexp.  Fixes #1086.
 2010-04-04 14:28:09 -07:00
Bharat Mediratta 78db1bb339 Fix a bug where if the file name is composed of entirely illegal 
characters, we'll get an empty slug.  Partial fix for #1086.
 2010-04-04 14:27:39 -07:00
Bharat Mediratta 5679e30ef6 REST changes: Allow PUT and POST requests to modify members, not 
just entity.

TESTS ARE NOT UPDATED YET.

- Fix item_rest::get() to maintain the proper sort order, which
  requires duplicating some Item_Model code.

- Elide "weight" from the REST version of item

- Adjust the weight of members according to the order they're returned
  from the client.  You can't add or remove members here, you can only
  reorder them.

- Changed the wire protocol to handle more complex values.
  Now "entity" and "members" are JSON encoded.  The Gallery3
  helper does this correctly.

- Changed the wire protocol for tag_item -- now it stores the
  tag and item urls in the entity, not as members.  This is more
  consistent.

- Added missing security for renaming and deleting tags.

- Got rid of vestigial tag_rest::post().  We add/remove tags
  via the relationship.
 2010-04-04 11:55:54 -07:00
Bharat Mediratta 4e450b5a96 Always return an array from item_ordered_members_rest::relationships() 2010-04-02 11:53:24 -07:00
Bharat Mediratta 93eab24c4a Add a new resource for managing child item orders. 2010-04-01 21:00:13 -07:00
Tim Almdal 0dfc62051e Update the flex organize to use access_key instead of access_token 2010-03-31 07:14:48 -07:00
Tim Almdal f2ed1eeab2 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/rest/controllers/rest.php
 2010-03-31 07:14:06 -07:00
Bharat Mediratta 668c12da1c Rest -> REST 2010-03-30 20:47:45 -07:00
Bharat Mediratta ca977dce51 Rename "access_token" to "access_key" in the code for consistency. 2010-03-30 14:01:40 -07:00
Bharat Mediratta 59b6cd30e6 Rename "user_access_tokens" table to "user_access_keys" as step 1 of a 
multi step process to refer to REST access keys as "access_key"
everywhere.  Bump the rest module to version 2.
 2010-03-30 13:53:14 -07:00
Bharat Mediratta 7f175ea87e Move G2_Import_Exception into libraries because it's not a helper class. 2010-03-30 13:18:05 -07:00
Bharat Mediratta d78ea4bc0a Checkpoint 2010-03-30 13:18:03 -07:00
Tim Almdal e56473c5d7 Checkpoint the organize flex source. Not production ready, but worth checkpointing. 2010-03-30 08:08:30 -07:00
Tim Almdal 7c84ee1b33 Organize now has the add album functionality. 2010-03-30 07:55:56 -07:00
Tim Almdal 91f27bf32f add a controller method to return the translated labels for the add album dialog. 2010-03-30 06:33:42 -07:00
Tim Almdal f5490ddcb0 Merge branch 'master' into talmdal_dev 2010-03-29 09:03:53 -07:00
Bharat Mediratta ea43c5f06f Merge branch 'master' of github.com:gallery/gallery3 2010-03-28 21:04:44 -07:00
Tim Almdal 0c1595d7e8 Clean up the organize_dialog file of some cruft and add the organize.swf file to the organize module. 2010-03-27 15:55:42 -07:00
Tim Almdal 67a8ef4277 Convert the old organize to the new flex based organize 2010-03-27 11:16:41 -07:00
Tim Almdal 7e9eca7f67 Merge branch 'master' into talmdal_dev 2010-03-21 20:45:57 -07:00
Tim Almdal 7b35091b47 If the access token is not set, then look in the post data. 2010-03-21 20:45:22 -07:00
Chad Kieffer e8eb23db42 Increase specificity for .g-item width to ensure it overrides the wind theme's default width when thumbnails are something other than the default. Fixes ticket #1053. 2010-03-20 14:55:41 -06:00
Tim Almdal 846a835e13 Merge branch 'master' into talmdal_dev 2010-03-17 14:25:20 -07:00
Chad Kieffer 0e9c626684 Add more padding to the top of the add-photos-canvas to avoid overlap with selected photos. 2010-03-16 23:10:15 -06:00
Tim Almdal 99c1c2a6b1 Changes to the example client to test updating the members of an album. 2010-03-13 23:12:40 -08:00
Tim Almdal 48b8b4f689 Merge branch 'master' into talmdal_dev 2010-03-13 23:11:53 -08:00
Tim Almdal 13f5d3aa33 Whitespace correction 2010-03-13 23:11:33 -08:00
Tim Almdal 582765ca2f Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev 2010-03-13 08:43:16 -08:00
Tim Almdal b2bb817214 Merge branch 'master' into talmdal_dev 2010-03-13 08:40:57 -08:00
Tim Almdal 50a3ae7d0c Synchronize line endings 2010-03-13 08:39:53 -08:00
Tim Almdal 5467e21e8b Changes to support updating the child elements within an album. In this change the urls of the children are sent up asan array of post fields children[0].... children[n]. If an existing child is not included it is deleted. Including a url to an child in another album will move the child. Changing the order of the children will respect the order of the children, if the sort column is 'weight' 2010-03-13 08:39:06 -08:00
Bharat MedirattaandTim Almdal 9314533048 Update tests to reflect the fact that you have to be logged in to do anything. 2010-03-13 08:39:05 -08:00
Bharat MedirattaandTim Almdal c69f5f4906 Guests don't get access to the REST API. 2010-03-13 08:39:05 -08:00
Florent PaternoandTim Almdal 08f11ce90e Fix bug #1015 : repeated ids are prohibited 2010-03-13 08:39:04 -08:00
Tim Almdal 995994b93a Synchronize the line endings with the vendor branch. 2010-03-13 08:30:08 -08:00
Tim Almdal b7786fe9a3 Changes to support updating the child elements within an album. In this change the urls of the children are sent up asan array of post fields children[0].... children[n]. If an existing child is not included it is deleted. Including a url to an child in another album will move the child. Changing the order of the children will respect the order of the children, if the sort column is 'weight' 2010-03-13 08:16:37 -08:00
Tim Almdal 8715f602bd Merge branch 'master' into talmdal_dev 2010-03-08 09:46:13 -08:00
Bharat Mediratta be580c9554 Update tests to reflect the fact that you have to be logged in to do anything. 2010-03-05 21:42:39 -08:00
Bharat Mediratta 6429110cd0 Merge branch 'master' of git://github.com/fpaterno/gallery3 2010-03-05 21:25:22 -08:00
Tim Almdal 1c022a5c84 Merge branch 'master' into talmdal_dev 2010-03-05 06:54:12 -08:00