summaryrefslogtreecommitdiff
path: root/modules
AgeCommit message (Collapse)Author
2009-07-27Merge branch 'master' of git@github.com:gallery/gallery3Andy Staudacher
2009-07-27Revert "Remove an useless ORDER BY."... the order by wasn't all that useless.Andy Staudacher
This reverts commit c80d2da0a95a63b76f5a4c835f1a0e1022ec2f53. Conflicts: modules/gallery/models/item.php
2009-07-27Revert "Fix for ticket #452"Tim Almdal
This reverts commit 809e52d80cbf3beb75b238fddb0da3951fb9a8e7.
2009-07-27Back out the fix for ticket #452Tim Almdal
Revert "Changed access::user_can to force the owner of an item to have" This reverts commit 0b97cfd6f098be08be5f3cf1dbca1cce580ae330.
2009-07-27Back out fixes for ticket #452Tim Almdal
Revert "It helps to save before committing :-)" This reverts commit 0d76d6fd77f53e9e92a9a013cd112c69217f3ceb.
2009-07-26Merge branch 'master' of git://github.com/rledisez/gallery3 into rledisez/masterAndy Staudacher
2009-07-26Updated wording of tag separator tipChad Kieffer
2009-07-26It helps to save before committing :-)Tim Almdal
2009-07-26Changed access::user_can to force the owner of an item to haveTim Almdal
view permission on the parent. Added a whitelist of allowable owner permissions. If the requested permission is view and the user requesting access is the owner, check that they have view permission to the parent.
2009-07-25Fix for ticket #452Tim Almdal
1) Change access_Core::user_can to return true for all permissions if the owner is the specified user. 2) Change Item_Model::viewable to set the owner_id is the first view_restriction This allowed simplification of the generating the where clause to a single $this->orwhere instead of a where and an orwhere.
2009-07-25Fix for ticket #594. Forced the directory name to be required when editting ↵Tim Almdal
the album.
2009-07-25fix for ticket #574. The user->url database wasn't being set when the user ↵Tim Almdal
was updated via the admin panel.
2009-07-25Pass the variable when the "user_edit_form" event is fired.Tim Almdal
2009-07-25Rename columns that use reserved SQL words : items.left and items.rightRomain LE DISEZ
2009-07-25Merge commit 'upstream/master'Romain LE DISEZ
2009-07-23Merge branch 'master' of git@github.com:/gallery/gallery3Bharat Mediratta
2009-07-24Add tag autocomplete to the album and photo edit pop up dialogs.Tim Almdal
This required putting a wrapper view around the forms and passing this view as the parameter to the item_edit_form event. The view contains a $script variable that the modules can add script to be included in the form html when rendered as part of the ajax response.
2009-07-24Partial implementation of ticket #80. Provide auto complete and suggestions ↵Tim Almdal
on the tag add form in the tag sidebar block. Updated the xss golden file as well. Still to do figure out how toget it into the edit popup dialog
2009-07-23Smooth out the animaation for the progress bar.Bharat Mediratta
2009-07-23Disable the album cover icon if the item is already the current album cover.Bharat Mediratta
2009-07-23Don't escape & in JS text; it triggers the "Disallowed key charactersBharat Mediratta
in global data." check in the Input library.
2009-07-23Updated golden fileBharat Mediratta
2009-07-23Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-07-23Respect the $type parameter on Tag_Model::items_count()Tim Almdal
2009-07-23Merge commit 'upstream/master'Romain LE DISEZ
Conflicts: modules/gallery/helpers/access.php
2009-07-23Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-07-23Add form processing events:Bharat Mediratta
user_add_form_admin admin adding a user user_edit_form_admin admin editing a user user_add_form_admin_completed successfully added a user (admin) user_edit_form user editing their own settings user_edit_form_completed successfully edited a user (admin and user editing own settings)
2009-07-23Fix for ticket #496. replace the src attribute (non standard) with the title ↵Tim Almdal
attribute to contain the url of the tag cloud controller.
2009-07-23Convert instances of theme_url() to just url() to match the API changeBharat Mediratta
made in dbeadc1407293d0c7af36723db6fe5699890b845
2009-07-23Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-07-23Make tag handling consistent by converting spaces to periods and using ↵Tim Almdal
commas or semi-colons as separators
2009-07-23Fix a typo in a commentBharat Mediratta
2009-07-23Upgrade code to migrate the ACL from integer to boolean.Romain LE DISEZ
Related to 719c59e0402464a0e2b14915f6d10218ff5d4729 (cherry picked from commit 831bf63c236fe88624470d2906729e035e9dbfc8)
2009-07-23Consistency : always use self::XXXRomain LE DISEZ
(cherry picked from commit c9017ae2f21ff8f5d745f296a636b80a30add6a1)
2009-07-23Use BOOLEAN instead of integer to describe the permissions :Romain LE DISEZ
- DENY = false - ALLOW = true - UNKNOW = null (for intent only) - INHERIT = null (for cache) Upgrade is not included for now. (cherry picked from commit 719c59e0402464a0e2b14915f6d10218ff5d4729)
2009-07-23Merge commit 'upstream/master'Romain LE DISEZ
2009-07-23Remove extra error log lineBharat Mediratta
2009-07-23Test cleanup:Bharat Mediratta
1) Specifically catch Kohana_404_Exception and let other exceptions pass, the test framework will report them as errors 2) Simplify some testing idioms 3) Change malicious address to a legal addr
2009-07-23Fix for ticket #502Tim Almdal
This patch allows users with only view permission to request fullsize prints using Digibug. There is now a Digibug config file that contains the IP ranges of the Digibug servers. Any request for the full size image via the print proxy must come from within the ranges in the config file. The reason for the "if (!Test_Mode) {..." is that the print proxy makes a call to Kohana::close_buffers, which closes all the output buffers and then we see the image download on the console which messes up the test output.
2009-07-22remove an extra ->reload() that was there for testingTim Almdal
2009-07-22Add explicit unit tests for access::user_canTim Almdal
2009-07-22Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-07-22Use the Kohana cascading filesystem to locate resources loaded by theBharat Mediratta
theme. Because the theme comes first, this means that themes can override any module resources, at the cost that we no longer have namespacing for JS and CSS files. The only file getting used outside of this model is themes/default/screen.css which is used in the admin theme. I fixed that by copying screen.css into admin_default and renaming its screen.css to admin_screen.css. I also copied over all the images that it was referencing. Fixes tickets #48 and #539. Theme API changes: - theme_script(), theme_url() and theme_css() are no longer needed - script(), url() and css() now refer to the first matching asset in the module load path, where gallery3/lib is at the end of the path
2009-07-22bump version to "3.0 git (pre-beta3)"Bharat Mediratta
2009-07-22Modified the notification get_subscribers to ignore any users that don'tTim Almdal
have "view" access to the item the notification is being generated for. Fix for ticket: #538.
2009-07-22Merge commit 'upstream/master'Romain LE DISEZ
2009-07-22Duh... when I added user_can, I passed in the user, but still used the ↵Tim Almdal
groups from the session
2009-07-22Upgrade code to migrate the ACL from integer to boolean.Romain LE DISEZ
Related to 719c59e0402464a0e2b14915f6d10218ff5d4729
2009-07-22Merge commit 'upstream/master'Romain LE DISEZ
2009-07-21Add an API method user_can that allows for checking a specific user has theTim Almdal
specified permission to the item. Changed can to delegate to this method passing in the active user.