stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-05 14:40:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,487 Commits 4 Branches 0 Tags
fcbb4eef23e05261efd4e6a840f2abdef8055fc6
Commit Graph
4249 Commits
Author SHA1 Message Date
Bharat Mediratta 4ca91bf618 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/tests/Access_Helper_Test.php
 2010-01-27 19:20:38 -08:00
Bharat Mediratta f906210147 Verified and updated 2010-01-27 09:55:49 -08:00
Bharat Mediratta 7667864d61 Minor test-only fixes. 2010-01-27 09:55:00 -08:00
Bharat Mediratta 63db756441 Switch to using test helper. Also, reload the album before running 
access::deny since the mptt pointers will have changed.
 2010-01-27 01:49:37 -08:00
Tim Almdal df5da84ebb Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-26 19:59:51 -08:00
Tim Almdal 0de067312e Add a routing that allow add and edit form requests to be routed the same way as non admin forms. i.e. a uri of /form/add/admin/<controller>/parms gets routed as admin/<controller/form_add/<parms> 2010-01-26 19:59:44 -08:00
Bharat Mediratta c5cdd13b41 Added view_permissions_propagate_down_to_photos_test(). 2010-01-26 13:29:22 -08:00
Bharat Mediratta e0d31add9f Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-26 13:26:26 -08:00
Bharat Mediratta e315ce348b Added view_permissions_propagate_down_to_photos_test(). 2010-01-26 13:26:03 -08:00
Tim Almdal accd00464e Add a maintenance task that will clear the expired files (older than 2 weeks) from var/logs and var/tmp. Fixes ticket #982 2010-01-26 07:03:14 -08:00
Bharat Mediratta f268128043 Add support for adding tags in the item_tags and tag_items 
relationship collections.
 2010-01-26 00:24:10 -08:00
Bharat Mediratta 5c68519d92 Specialize the album cover id check to allow the root album to have no 
album cover.
 2010-01-26 00:23:45 -08:00
Bharat Mediratta 953c9283ad Always keep the original around when updating existing items, because 
we need it for the item_updated event.
 2010-01-25 23:39:24 -08:00
Andy Staudacher 119297e2ad Apply html::clean() to UI visible strings, and show language names instead of locale tags to be consistent with the user edit form. 2010-01-25 23:05:41 -08:00
Bharat Mediratta b6dab323ac Use ORM to create the users since now our validation can handle doing 
it the right way.  Set a default email address for admins.
 2010-01-25 20:42:48 -08:00
Bharat Mediratta 01dfa29888 Make some exceptions for guests: 
1) They don't require email
2) Guest users aren't in the everybody group.
 2010-01-25 20:40:44 -08:00
Bharat Mediratta f8b8103c24 Make only one attempt to restore the old identity provider in case of 
failure.  Else, we can get into an infinite recursion.
 2010-01-25 19:50:56 -08:00
Bharat Mediratta b65baa522b Merge branch 'bharat_dev' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-25 19:50:06 -08:00
Bharat Mediratta 804614711a Make only one attempt to restore the old identity provider in case of 
failure.  Else, we can get into an infinite recursion.
 2010-01-25 19:49:52 -08:00
Bharat Mediratta 1606961153 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/libraries/MY_ORM.php
 2010-01-25 19:49:17 -08:00
Tim Almdal 6023f2bb46 Remove the return url and change the return button on the user profile page to use javascript to return to the previous page. 2010-01-25 08:10:28 -08:00
Tim Almdal 445295a1ed Insure that if original() is called and no original has been created, then create it before returning. Fixes ticket #989. 2010-01-24 22:08:59 -08:00
Tim Almdal 865995305c Add the active notifications and rest api key to user profile page. 2010-01-24 20:14:01 -08:00
Tim Almdal 26eb000637 add CSRF protection to the user profile send method. 2010-01-24 15:49:02 -08:00
Tim Almdal c9ea1a64de Remove the one last remaining reference to "no_module_admin". 2010-01-24 15:40:56 -08:00
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