stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-28 02:34:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,262 Commits 4 Branches 0 Tags
3461b4e8e65791ae4e01fd45da5df76a9a929dbf
Commit Graph
409 Commits
Author SHA1 Message Date
Tim Almdal 3461b4e8e6 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-28 20:49:50 -07:00
Bharat Mediratta 30586236a5 Make sure the thumb_menu has the gThumbMenu CSS class. 2009-07-28 20:44:50 -07:00
Bharat Mediratta 544e92adc9 Move site_menu and admin_menu into gallery helper so that site_menu 
can call admin_menu.
 2009-07-28 20:32:11 -07:00
Bharat Mediratta eda2d75fa0 Disable smooth progressbar scrolling when we're at 100% (else the 
progressbar trucks along slowly even though the task is done).
 2009-07-28 20:31:24 -07:00
Bharat Mediratta 44bc74edb9 Change search callbacks to use the event system, so move them out of 
xxx_search helpers and into xxx_event helpers.
 2009-07-28 20:30:34 -07:00
Bharat Mediratta 1e90e40d3a Use events to generate menus, instead of having xxx_menu helpers. 
This is the first step towards having a simple, lightweight and
unified API for module interaction.
 2009-07-28 13:47:22 -07:00
Tim Almdal f5c4d23e57 Convert the album add dialog to use the new Form_Script library 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 21:39:05 +08:00
Tim Almdal dfaf870310 Convert the album add dialog to use the new Form_Script library 2009-07-28 06:33:25 -07:00
Tim Almdal a7f4d7aced Revert commit 078c77a62b and change the 
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 21:00:25 +08:00
Tim Almdal 2e8f73d4e9 Revert commit 078c77a62b and change the 
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.
 2009-07-28 05:40:28 -07:00
Tim Almdal 2f969c80eb Create A Forge Script element. Form_Script allows the specification 
of either a url to a script file or in line text which will be included
in a script block.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 12:04:23 +08:00
Tim Almdal 4550969101 Create A Forge Script element. Form_Script allows the specification 
of either a url to a script file or in line text which will be included
in a script block.
 2009-07-27 20:59:58 -07:00
Tim Almdal a4c807232a Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-27 15:49:20 -07:00
Bharat Mediratta 7efb4b4cdf Remove the unnecessary ORDER BY on $this->sort_column in 
get_position(), and instead apply an ORDER BY on `id` in the 2nd query
so that we have stability among the equal elements.  This should
result in cheaper (and more sensible) queries.
 2009-07-27 15:17:14 -07:00
Tim Almdal 1f014aae6c Allow a theme to override the page refresh mechanism. Create a new 
javascript lib (gallery.reload.js) which defines the functions
gallery_reload() and gallery_location(new_location).  They just
do a window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
 2009-07-27 12:39:12 -07:00
Bharat Mediratta b3fe70e654 Updated. 2009-07-27 11:34:27 -07:00
Andy Staudacher e68599f6d7 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-27 11:27:50 -07:00
Andy Staudacher d18f31ab21 Revert "Remove an useless ORDER BY."... the order by wasn't all that useless. 
This reverts commit c80d2da0a9.

Conflicts:

	modules/gallery/models/item.php
 2009-07-27 11:25:23 -07:00
Tim Almdal 4edf86f0eb Revert "Fix for ticket #452" 
This reverts commit 809e52d80c.
 2009-07-27 11:14:03 -07:00
Tim Almdal 5fd82a2ede Back out the fix for ticket #452 
Revert "Changed access::user_can to force the owner of an item to have"

This reverts commit 0b97cfd6f0.
 2009-07-27 11:13:20 -07:00
Tim Almdal 1ec1f19f1a Back out fixes for ticket #452 
Revert "It helps to save before committing :-)"

This reverts commit 0d76d6fd77.
 2009-07-27 11:12:27 -07:00
Andy Staudacher 570e0b0267 Merge branch 'master' of git://github.com/rledisez/gallery3 into rledisez/master 2009-07-26 22:45:53 -07:00
Tim Almdal 0d76d6fd77 It helps to save before committing :-) 2009-07-26 09:33:44 -07:00
Tim Almdal 0b97cfd6f0 Changed access::user_can to force the owner of an item to have 
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-26 09:29:29 -07:00
Tim Almdal 809e52d80c Fix for ticket #452 
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-25 23:45:48 -07:00
Tim Almdal f8516b55d2 Fix for ticket #594. Forced the directory name to be required when editting the album. 2009-07-25 15:18:41 -07:00
Romain LE DISEZ 23bb6eb7e3 Rename columns that use reserved SQL words : items.left and items.right 2009-07-25 19:06:54 +02:00
Romain LE DISEZ 0aa3ec3ae9 Merge commit 'upstream/master' 2009-07-25 13:59:04 +02:00
Bharat Mediratta 50d6cc0150 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-23 22:08:29 -07:00
Tim Almdal 078c77a62b Add tag autocomplete to the album and photo edit pop up dialogs. 
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-24 14:18:15 -07:00
Tim Almdal fa1d32e646 Partial implementation of ticket #80. Provide auto complete and suggestions 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-24 11:24:43 -07:00
Bharat Mediratta 5c8a2a750c Smooth out the animaation for the progress bar. 2009-07-23 20:43:32 -07:00
Bharat Mediratta 01aea268e6 Disable the album cover icon if the item is already the current album cover. 2009-07-23 17:15:53 -07:00
Bharat Mediratta 0e9b80d2ef Updated golden file 2009-07-23 16:20:40 -07:00
Romain LE DISEZ b181707c16 Merge commit 'upstream/master' 
Conflicts:

	modules/gallery/helpers/access.php
 2009-07-23 19:44:40 +02:00
Bharat Mediratta 7f1a7ead58 Fix a typo in a comment 2009-07-23 09:24:33 -07:00
Romain LE DISEZandBharat Mediratta 216a21ba8a Upgrade code to migrate the ACL from integer to boolean. 
Related to 719c59e040
(cherry picked from commit 831bf63c23)
 2009-07-23 09:12:15 -07:00
Romain LE DISEZandBharat Mediratta 7c7d4c0ec0 Consistency : always use self::XXX 
(cherry picked from commit c9017ae2f2)
 2009-07-23 09:12:08 -07:00
Romain LE DISEZandBharat Mediratta 350c1b0267 Use BOOLEAN instead of integer to describe the permissions : 
- DENY = false
 - ALLOW = true
 - UNKNOW = null  (for intent only)
 - INHERIT = null (for cache)

Upgrade is not included for now.
(cherry picked from commit 719c59e040)
 2009-07-23 09:11:55 -07:00
Romain LE DISEZ 386130114b Merge commit 'upstream/master' 2009-07-23 18:08:57 +02:00
Tim Almdal 85ed445e23 remove an extra ->reload() that was there for testing 2009-07-22 15:20:30 -07:00
Tim Almdal d4104a23ec Add explicit unit tests for access::user_can 2009-07-22 15:16:56 -07:00
Bharat Mediratta dbeadc1407 Use the Kohana cascading filesystem to locate resources loaded by the 
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-22 14:27:57 -07:00
Bharat Mediratta 4854003f41 bump version to "3.0 git (pre-beta3)" 2009-07-22 13:03:01 -07:00
Romain LE DISEZ 06fd89e8bc Merge commit 'upstream/master' 2009-07-22 19:04:16 +02:00
Tim Almdal 4ddaaeb9dd Duh... when I added user_can, I passed in the user, but still used the groups from the session 2009-07-22 09:39:22 -07:00
Romain LE DISEZ 831bf63c23 Upgrade code to migrate the ACL from integer to boolean. 
Related to 719c59e040
 2009-07-22 15:40:49 +02:00
Romain LE DISEZ 317b7b98c0 Merge commit 'upstream/master' 2009-07-22 08:38:06 +02:00
Tim Almdal f533aee1cc Add an API method user_can that allows for checking a specific user has the 
specified permission to the item.  Changed can to delegate to this method
passing in the active user.
 2009-07-21 15:52:46 -07:00
Tim Almdal 9f410ec764 Always display the option menu so that modules with options that require 
menu items with view permission have somewhere to hang these menu items
from.  If its empty it will get removed by $menu->compact()
 2009-07-21 15:49:42 -07:00