Bharat Mediratta and Tim Almdal
b2afba1db1
The fact that we have a path to a G2 embed file doesn't mean that it's still
...
valid so check to see that it's ok before proceeding. This should resolve #458 .
2010-06-15 09:14:10 -07:00
Tim Almdal
f5eb5d5d70
add an 'icon' to identify albums in the organize dialog.
2010-06-15 09:14:09 -07:00
ckieffer and Tim Almdal
9911372d58
Removed self-closing slash from opening <li> tag.
2010-06-15 09:14:09 -07:00
Tim Almdal
f10d641044
Change the parameters for the organize dialog box. The baseUrl parameter was removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box.
2010-06-14 13:07:58 -07:00
Tim Almdal
1c5264d7f5
Merge branch 'master' of git@github.com:gallery/gallery3
2010-06-14 07:44:17 -07:00
Bharat Mediratta
793780daa7
Replace __CSRF__ with the actual csrf token.
2010-06-13 20:51:11 -07:00
Bharat Mediratta
6f443a819b
Change single to double quotes.
2010-06-13 20:49:50 -07:00
Tim Almdal
821d3f7854
Remove a debugging statement.
2010-06-13 19:50:52 -07:00
Tim Almdal
5decb3b252
Move the source to the gallery3-flex repository.
2010-06-13 19:31:48 -07:00
Tim Almdal
47aa651430
Fix problems ith IE and flex initialization when one of the flashvars contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome
2010-06-13 17:58:50 -07:00
Tim Almdal
938eea7fc4
Merge branch 'master' into talmdal_dev
2010-06-13 09:59:27 -07:00
Bharat Mediratta
db0966a9bc
Fix up some indentation and comment style.
2010-06-12 15:39:38 -07:00
Bharat Mediratta
87f8b6ff0a
Bounce the user to the login page if they try to get to part of the
...
admin site as a guest. Also, theme the login/html page.
2010-06-12 15:28:03 -07:00
Bharat Mediratta
dceecabbf1
Make login/logout continuation url code consistent. Where necessary,
...
we specify the continue_url in the session, but we store it in the
login form so that we can propagate it across the session creation
that happens at login time.
2010-06-12 15:16:47 -07:00
Bharat Mediratta
c026da85cd
Use "continue_url" instead of "continue" for consistency with the
...
reauth code.
2010-06-12 15:10:34 -07:00
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
41c18929cd
Remove the duplicate query when searching as pointed out by joe7 on ticket #844
2010-06-11 15:54:08 -07:00
Tim Almdal
4c6045843d
Merge branch 'master' of git@github.com:gallery/gallery3
2010-06-11 15:41:00 -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
Bharat Mediratta
2c1e3800ef
Send back the REST API version as a header. It's on every request,
...
which sucks, but it's totally unobtrusive because it's a header so
that's ok. Decided that the current version is "3.0" although it will
surely change before the final 3.0 release.
Fixes ticket #1148
2010-06-11 14:59:17 -07:00
Tim Almdal
bb35aefffb
Fix for ticket #797
...
When load a file is uploaded using a dialog box and the jquery plugin ajaxForm, the ajaxForm plugin uses an hidden iFrame element to send the multi-part
form and this is where the response goes. The ajaxForm plugin then retrieves the document body and parses the result as a json string. If the file uploads
properly everything is fine, but if it fails Gallery3 return the input form with the the error fields highlighted as part of the json response. As this
response is returned to a hidden iframe, the browser attempts to manipulate it and all hell breaks loose. We lose the trailing brace, we start getting
escaping of form tags. When the ajaxForm plugin retrieves the iFrame body its no longer a valid json frame and the parsing fails and the user sees no
indication that it failed.
2010-06-11 12:36:23 -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
cbcb7432b3
Correct a problem with the sort order and sort direction fields being ignored.
2010-06-10 14:10:19 -07:00
Tim Almdal
6aab0cbec6
Review the code for xss exposures and provide the functionality to update the organize dialog bar when the selected album changes.
2010-06-10 13:12:10 -07:00
Tim Almdal
38e8ab3d71
Provide better handling and a progress dialog when loading or updating files.
2010-06-10 09:14:13 -07:00
Tim Almdal
30849d10b1
Tweak the error response for rest requests to make it easier for the client to extract error information.
2010-06-10 08:18:15 -07:00
Tim Almdal
6119ddc735
Merge branch 'master' into talmdal_dev
2010-06-10 08:16:07 -07:00
Bharat Mediratta
26d0af45ea
New version of EXIF gets ISO and Metering Mode right. Yay!
2010-06-09 21:45:05 -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
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 MedirattaandTim Almdal
ckiefferandTim Almdal