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
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
Bharat Mediratta
9a1995a879
Merge branch 'master' of github.com:gallery/gallery3
2010-05-14 16:20:20 -07:00
Bharat Mediratta
ad0e7254eb
Require a well-formed email address for all comments.
2010-05-14 16:19:53 -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
Tim Almdal
28aee01130
Merge branch 'master' into talmdal_dev
2010-05-14 06:32:26 -07: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
Tim Almdal
3fe10b15cf
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.
2010-05-10 06:31:38 -07:00
Tim Almdal
e9c8a8ae53
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.
2010-05-09 20:41:37 -07:00
Tim Almdal
32fa15ca3a
Add dependency checking to insure the administrator is notified if the rest module is deactivated
2010-05-09 20:39:31 -07:00
Tim Almdal
357d20a680
Merge branch 'master' into talmdal_dev
2010-05-08 21:09:15 -07:00
ckieffer
44753c5249
Deleted extra CSS class assignment for context_menu delete option.
2010-05-08 15:05:56 -06:00
ckieffer
fcc446bf00
Move print with digibug to the site menu.
2010-05-08 13:54:27 -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
ckieffer
e30849d310
Applied capitalization rules to title, changed from Tag admin to Manage tags
2010-04-29 23:59:20 -06:00
ckieffer
35839c85f2
Applied capitalization rules to title.
2010-04-29 23:20:49 -06:00
Bharat Mediratta
4068e80f06
Update test to reflect slug change in 78db1bb339
2010-04-22 22:24:44 -07:00
Chad Kieffer
67ced571c7
HTML validation and accessibility fix, add id attr to add tag input.
2010-04-21 22:48:33 -06:00
Chad Kieffer
39818dd29f
Comment updates. Add empty <li> to empty <ul> for HTML validation, fixes #1066 . Minor CSS/JS fixes. Add scrollTo effect when clicking on 'Add a Comment'.
2010-04-21 22:36:52 -06:00
Tim Almdal
14683ec0e8
Correct typo: change relationship to relationships
2010-04-21 15:32:49 -07:00
Tim Almdal
0565d9f0f9
Merge branch 'master' into talmdal_dev
2010-04-21 06:48:08 -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
27b29afd7c
Add user::valid_username() as a validation helper.
2010-04-17 12:26:52 -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
Tim Almdal
027312596c
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.
2010-04-16 15:28:35 -07:00
Tim Almdal
a2e0472f83
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-16 14:30:41 -07:00
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
