stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-11 23:29:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,074 Commits 4 Branches 0 Tags
77ec06166320dee631bbffcf3d57b0e2debcb157
Commit Graph

282 Commits

Author SHA1 Message Date
Bharat Mediratta
cc4a54a3d6 Fix bug introduced in b6fa33faf7. Don't 
try to use $(this).data("reload.location") if it hasn't been set,
which can happen if Flash isn't available.  Fixes #1362
 2010-09-11 22:18:53 -07:00
Tim Almdal
91d4ffa680 Change the color of the text in the close button to match the foreground color not the border color. 2010-09-09 20:36:18 -07:00
Tim Almdal
b6fa33faf7 Create a setLocation javascript callback which is called everytime with the full url of the current album(non-REST). When the dialog is closed the window location is set to this value and the page gets loaded appropriately. 2010-09-07 18:53:17 -07:00
Tim Almdal
438cea231d Clean up the default case in the OrganizeProperties::getProperty method 2010-08-31 20:40:48 -07:00
Bharat Mediratta
5568ab24de Normalize the "flash missing" message string with the one in the 
uploader for convenient localization.
 2010-08-30 22:21:00 -07:00
Tim Almdal
866f8eefc6 Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item. 2010-08-30 22:06:26 -07:00
Tim Almdal
0f2daf29ac Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item. 2010-08-30 22:05:01 -07:00
Bharat Mediratta
2c717b18d3 Don't concatenate two strings together as an argument for t() or t2(); 
the l10n_scanner cannot parse it properly and drops those from the
localization list.  Fixes ticket #1284.
 2010-08-29 20:04:02 -07:00
Bharat Mediratta
de93507d13 Regenerated version from 1e42ddf657 
which contains fixes for both #1174 and #1305.
 2010-08-29 12:10:20 -07:00
Bharat Mediratta
a184142d6f Revert "Update the Organize flash object with the fixes for ticket #1174." 
This commit reintroduces the bug in https://sourceforge.net/apps/trac/gallery/ticket/1305

This reverts commit efa1fce9de.
 2010-08-29 11:56:21 -07:00
Tim Almdal
efa1fce9de Update the Organize flash object with the fixes for ticket #1174. 2010-08-29 10:28:50 -07:00
Bharat Mediratta
922b810c56 Oops, forgot to create an install() function and set the version of 
the organize module to 2 in 8fb56abf03
 2010-08-28 21:25:09 -07:00
Bharat Mediratta
04add75f6f Get rid of the move dialog and move option. Instead, replace it with 
a call to Organize with the appropriate album open.  I have not yet
figured out how to get the SWF code to highlight the active image, but
that's coming.  Partial fix for #1204.
 2010-08-22 00:27:24 -07:00
Bharat Mediratta
91fab0fcf5 Compiled version of 88efbd77b4 2010-08-22 00:26:52 -07:00
Bharat Mediratta
4d55166eba Fix a bug where we were using names in a string context resulting in 
sending the wrong custom headers back. Fixed the names of the headers
to be slightly more meta. Fixes #1305

Implemented in gallery3-flex bea5f67efa93a3921eec8cd03a15d68f513f1dc0
 2010-08-21 16:52:46 -07:00
Bharat Mediratta
ae618840b6 Tighten up whitespace. 2010-08-21 15:25:06 -07:00
Bharat Mediratta
387d30da76 use HTTP_HOST instead of SERVER_NAME so that we're sending requests 
back to the same canonical domain that we came from.  Else Flash makes
crossdomain.xml requests, fails, and falls over.

Fixes ticket #1298.
 2010-08-17 22:32:47 -07:00
Bharat Mediratta
d2c59740b1 Updated organize SWF to understand data resources. 2010-08-15 00:00:31 -07:00
Bharat Mediratta
7607e1f932 Full pass over all the JSON encoding and JS dialog code. We now abide 
by the following rules:

1) An initial dialog or panel load can take either HTML or JSON, but
   the mime type must accurately reflect its payload.

2) dialog form submits can handle a pure HTML response, but the mime
   type must also be correct.  This properly resolves the problem
   where the reauth code gets a JSON response first from the reauth
   code, and then an HTML response when you reauth and continue on to
   a given form -- try it out with Admin > Settings > Advanced.

3) All JSON replies must set the mime type correctly.  The json::reply
   convenience function does this for us.

4) By default, any HTML content sent back in the JSON response should be
   in the "html" field, no longer the "form" field.

The combination of these allows us to stop doing boilerplate code like
this in our controllers:

  // Print our view, JSON encoded
  json::reply(array("form" => (string) $view));

instead, controllers can just return HTML, eg:

  // Print our view
  print $view;

That's much more intuitive for developers.
 2010-07-31 21:16:17 -07:00
Tim Almdal
91a2c04a24 More patches as part of #1225. Change the 'core' modules to use the json::reply 
method to set the content type header and encode the response as a json object
 2010-07-31 15:44:55 -07:00
Bharat Mediratta
185a736ff9 Revert "Combine all the flex runtime libraries into a single downloadable file. Fixes ticket #1241." 
This breaks organize on Chrome 5 (Linux) and Chrome 6 (OSX).  See ticket #1241.

This reverts commit 423fca2d5f.
 2010-07-27 11:28:12 -07:00
Bharat Mediratta
84a50e737b Fix the "get flashplayer" button. It was throwing a JS error before. 
Not sure why it was done in JS in the first place.  Fixes ticket #1256.
 2010-07-27 11:18:55 -07:00
Tim Almdal
f699d2b385 Fix missing quoate in the organize dialog html template. 2010-07-23 05:56:59 -07:00
Tim Almdal
423fca2d5f Combine all the flex runtime libraries into a single downloadable file. Fixes ticket #1241. 2010-07-23 05:54:50 -07:00
Bharat Mediratta
96bcc8146c Style and text cleanup. Parameterize the minimum flash value so that we can use it in the internationalized string. Fix capitalization. 2010-07-20 07:03:43 -07:00
Tim Almdal
bd969a6ffa Fix for ticket #1202. Set the minimum flash version 10.0.0 and display a message and a button to download the latest version if the minimum versiion is not installed. 2010-07-16 07:37:24 -07:00
Tim Almdal
329abfe539 Merge branch 'master' into talmdal_dev 2010-07-11 09:09:52 -07:00
Romain LE DISEZ
39962eaddc Accept extension .m4v as video/mp4 2010-07-10 08:09:04 -07:00
Tim Almdal
dbf3199e46 Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers 
that create the data to go into a dialog to return the html as part of a json object.
 2010-07-06 14:12:01 -07:00
Tim Almdal
a57ac38839 Change the organize dialog to make use of the new error handling 2010-06-19 17:32:15 -07:00
Tim Almdal
239da24786 Merge branch 'master' of git@github.com:gallery/gallery3 2010-06-18 21:49:26 -07:00
Tim Almdal
e40b2371ee Fix an issue that the root album was not being selected if there was no 
children, or if organize was being invoked on the root album.
 2010-06-18 21:49:11 -07:00
Bharat Mediratta
9b78867427 Simplify rest::get_access_key($user) to rest::access_key() that 
returns just the access key string for the active user.  That's how we
use the API, so keep it simple.
 2010-06-18 20:43:14 -07:00
Tim Almdal
545a91270d 1) Change how the size of the flexstage is calculated. (Basically remove the 
dialogWidth and dialogHeight and adjsut the internal controls when added to
   the stage.
2) Cleanup the controller code
 2010-06-18 19:05:59 -07:00
Bharat Mediratta
ec40e03a37 Use request::protocol(). 2010-06-18 15:20:32 -07:00
Tim Almdal
fce95785be Remove duplicate trailing slash on the controllerUri parameter 2010-06-17 17:41:35 -07:00
Tim Almdal
070db2a97a Rearrange the adding of fields to the template so that they match the order of appearance in the template. Also remove the @todo's 2010-06-17 10:21:37 -07:00
Bharat Mediratta
359235182e Add a cache-buster to the SWF url so that it'll refresh in the browser 
every time the SWF file changes.
 2010-06-17 09:57:38 -07:00
Tim Almdal
3d4f04e827 Change the add album dialog to not replace the internet address or name fields if they already contain values. 2010-06-17 06:14:24 -07:00
Tim Almdal
172c3fd209 Fix a typo... The controller parameter to the flex organize module should be controllerUri instead. 2010-06-16 17:31:31 -07:00
Bharat Mediratta
8fb56abf03 Bump the organize module to version 2, and check to make sure that the 
REST module is active.
 2010-06-15 16:30:02 -07:00
Bharat Mediratta
d96ce71f1a Remove a stray period. 2010-06-15 15:29:45 -07:00
Tim Almdal
81f176cf8e url::site(...) adds a leading slash to the uri it generates. Take this into account when creating the base url for accessing rest requests. 
Update the sort dropdown box to manual when album items are rearranged.
 2010-06-15 09:39:45 -07:00
Tim Almdal
f5eb5d5d70 add an 'icon' to identify albums in the organize dialog. 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
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
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