Commit Graph
3624 Commits
Author SHA1 Message Date
Tim Almdal 2cb28d46f8 Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-24 15:27:41 -08:00
Tim Almdal 7c06e21ec4 Refactor creating the user profile page content into the the event module. The show_user_profile is used to provide content to the user profile page. Add the list of the users comments to the profile page. 2010-01-24 15:27:33 -08:00
Bharat Mediratta cc91293573 Merge branch 'bharat_dev' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-24 14:57:13 -08:00
Bharat Mediratta 5b84919d6e First pass at converting server add to model based validation. 2010-01-24 14:21:57 -08:00
Bharat Mediratta a4519c6dce Updated for model based validation. 2010-01-24 14:03:36 -08:00
Bharat Mediratta cc79abd0af Simplify tag::add(). 2010-01-24 14:00:07 -08:00
Bharat Mediratta ca5f625a5e Log validation errors. 2010-01-24 11:40:01 -08:00
Tim Almdal 3b16d0662b Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-23 23:58:53 -08:00
Tim Almdal 3b8636e529 Update the Xss_Security_Test and the Controller_Auth_Test. 2010-01-23 23:53:16 -08:00
Tim Almdal c39437a192 Change the hover text to just display 'Your profile'. 2010-01-23 23:52:29 -08:00
Tim Almdal ed5b07b335 Create a user profile page that is used as a landing page when referencing a user in messages or pages.
Partial fix for ticket #889 and a fix for #931.
2010-01-23 21:38:01 -08:00
Bharat Mediratta 7096c29124 Switch to model based validation. 2010-01-23 17:07:09 -08:00
Bharat Mediratta 61e31b6f77 Fix typo: change $entryr to $entry->user 2010-01-23 16:45:10 -08:00
Bharat Mediratta eb32e1052d Fix typo: change $entryr to $entry->user 2010-01-23 16:44:30 -08:00
Bharat Mediratta fecac4a859 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/tests/xss_data.txt
2010-01-23 16:29:10 -08:00
Bharat Mediratta 8849594aa1 Merge branch 'bharat_dev' of git@github.com:/gallery/gallery3 into bharat_dev 2010-01-23 16:23:50 -08:00
Andy Staudacher c9b775c21a Fix for bug 984, consistently interpret installed / available locales as array.
On the current hostgater setup (PHP 5.2.12), locales::available() was returning an array and isset($locales->$code) would always (silently) return false.

Choosing array over stdClass since count($someStdClass) will always return 1, and not the number of object members.
2010-01-23 15:46:01 -08:00
Tim Almdal a1a3d4f595 Correct the javascript so it will find the "Continue" button in other languages than english. 2010-01-23 14:57:10 -08:00
Tim Almdal abdeb21ccb Add a user_menu method to the Admin_View and then use this method to get the
user menu.  Since the information displayed is identical in both admin and
theme views, it makes sense to combine the generation to it is done in a common
location.
2010-01-23 13:29:49 -08:00
Bharat Mediratta d4308e4d35 Updated 2010-01-23 12:16:04 -08:00
Bharat Mediratta a609694018 Update tests for recent REST changes. 2010-01-23 12:13:14 -08:00
Bharat Mediratta 4960061b56 Don't use ORM_MPTT::move_to directly, it's protected. 2010-01-23 11:35:26 -08:00
Tim Almdal 06ef3885b3 Increase the size of the 'select photos' button so that it doesn't wrap and set the size of the underlying flash object. 2010-01-23 09:23:08 -08:00
Tim Almdal ece403877f If the userid/password combination, render the full page instead of just printing the form. Fixes ticket #980. 2010-01-22 18:12:30 -08:00
Tim Almdal ff5ccf0fb3 Specify the height and overflow-y on l10n-client translation element. fixes ticket #899. 2010-01-22 14:38:58 -08:00
Tim Almdal b01fce613b Remove the g-right class on groups element on the manage user/groups page. fixes ticket #911 2010-01-22 14:16:41 -08:00
Tim Almdal 79bcfc93c3 Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-22 13:38:23 -08:00
Tim Almdal eabeeeb126 Trap any errors that may occur when trying to install a new identity provider and then reinstall the current one. 2010-01-22 13:38:05 -08:00
Tim Almdal df313cac56 Change the check_environment method in the module helper and the module installers to can_activate to reflect that it is doing more than just checking the environment. 2010-01-22 12:30:17 -08:00
Tim Almdal dabd5b84b2 Remove the identity manager screens and controller as alterntive identity providers are installed in the admin module screen. 2010-01-22 12:22:31 -08:00
Tim Almdal 1175783123 Disable the continue button after clicking so it can only clicked once. 2010-01-22 12:16:36 -08:00
Tim Almdal ae568b6182 Refactor the identity provider installation in to a common helper method (change_provider) with an initialization callback. 2010-01-22 12:09:11 -08:00
Bharat Mediratta eea27c39f1 Create symmetrical relationship collections: item_tags and tag_items
Now when we represent a relationship collection we can refer to it in
proper semantic terms.
2010-01-22 09:43:02 -08:00
Tim Almdal 603c3049a1 Treat identity providers just like other modules and use the admin_module to
install and switch to a different identity provider.
2010-01-22 09:39:29 -08:00
Bharat Mediratta e56318d07f Don't try to access ORM::$changed externally; it's protected. 2010-01-22 01:48:03 -08:00
Bharat Mediratta b37ef6e8d9 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-22 01:43:53 -08:00
Andy Staudacher 120c9c749e Change "fetch translations" task to fetch them in batches.
The request limit was in place already, but the client didn't respect it before, leading to unhappy users in case they had lots of 3rd party modules installed, or more than 2-3 locales enabled. This is all taken care of now.
2010-01-22 01:16:16 -08:00
Bharat Mediratta 25dc3e1a7b Moved to Item_Rest_Helper_Test.php 2010-01-22 01:11:03 -08:00
Bharat Mediratta 61198c22aa Reload items after saving so that we convert their members to strings. 2010-01-22 01:10:52 -08:00
Bharat Mediratta 0efbfcbe61 Return the url of the newly created item from post().
Don't try to access ORM::$changed -- it's protected.
2010-01-22 01:10:31 -08:00
Bharat Mediratta a445a64bcb Return the url of the newly created item from post(). 2010-01-22 01:10:00 -08:00
Bharat Mediratta ca909a49ae New tests for tag_item_rest 2010-01-22 01:09:38 -08:00
Bharat Mediratta 10dfe9767d Updated tests to pass after recent refactor of tag_rest. 2010-01-22 00:59:37 -08:00
Bharat Mediratta a0c6d055d1 output_type --> output 2010-01-22 00:53:44 -08:00
Bharat Mediratta 27acb156bc Updated tests to pass after recent refactor of tags_rest. 2010-01-22 00:51:23 -08:00
Bharat Mediratta cb8b31d70c Updated tests to pass after recent refactor of gallery_rest -> item_rest. 2010-01-22 00:49:05 -08:00
Bharat Mediratta 2744b2e938 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-22 00:27:56 -08:00
Bharat Mediratta bcf1caad14 Reshape the rest code to be more consistent with regards to
relationships.  Now when you view a resource, it has 4 top level
elements:

url: the url of this resource
resource: array of key value pairs describing the resource
members: array of urls to members of this collection
relationships: array of array of members.

Relationships are a special type of collection that links two
different resources together.  To remove a relationship, just
DELETE its url.  To create a relationship, POST to its
collection.

Individual modules can add their own relationships to any
resource via a callback mechanism.

Example:
  Array(
    [url] => http://g3.com/rest/item/1
    [resource] => Array (
      [id] => 1
      [album_cover_item_id] => 4
      [captured] =>
      [created] => 1264056417
      [description] =>
      [height] =>
      ...
    )
    [members] => Array(
      [0] => http://g3.com/rest/item/2
      [1] => http://g3.com/rest/item/3
      [2] => http://g3.com/rest/item/4
      [3] => http://g3.com/rest/item/5
      ...
    )
    [relationships] => Array(
      [tags] => Array (
      [0] => http://g3.com/rest/tag_item/2,1
      [1] => http://g3.com/rest/tag_item/23,1
      )
    )
  )
2010-01-22 00:27:00 -08:00
Andy Staudacher 07ba5fe43a Use Unicode instead of HTML entity (since the l10n server normalizes this way and rejects submissions that change under the normalization step) 2010-01-21 23:53:21 -08:00
Bharat Mediratta 3665391f8b Guard against division by zero. 2010-01-21 21:29:42 -08:00