stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-10 05:29:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,286 Commits 4 Branches 0 Tags
0a2da7731ad7d1cf7c0164a455457d91ba767e83
Commit Graph

426 Commits

Author SHA1 Message Date
Tim Almdal
7aa03e59ba Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-30 19:25:43 -07:00
Bharat Mediratta
19d89f94f9 Remove debug statements 2009-07-30 09:57:24 -07:00
Bharat Mediratta
031a19724a Update golden file 2009-07-30 09:55:09 -07:00
Bharat Mediratta
0f43b35747 Fix a static function declaration. 2009-07-30 09:54:59 -07:00
Tim Almdal
d3ce7f7e36 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-30 08:09:40 -07:00
Bharat Mediratta
fc3273da4d Add some code to guard the weight calculation against zero rows when 
we're doing an initial install.
 2009-07-30 08:02:54 -07:00
Tim Almdal
fc7ef17e0f Remove try statement w/o catch 2009-07-30 05:27:19 -07:00
Tim Almdal
29f5a231c7 Merge branch 'master' of git@github.com:gallery/gallery3 
Conflicts:
	modules/gallery/models/item.php
 2009-07-30 05:15:24 -07:00
Bharat Mediratta
15f148349e Make body_attributes() a theme callback instead of a method on the 
View.  This allows modules to piggyback on it.
 2009-07-29 17:25:53 -07:00
Bharat Mediratta
ca96d47196 Oops, I removed too much in my last change. Put talmdal's query back, 
but change it to use Database instead of ORM for a little more
efficiency.
 2009-07-29 16:58:29 -07:00
Tim Almdal
6f1da3aba4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-29 16:47:16 -07:00
Bharat Mediratta
5d0413631f Bump the gallery version to 10 in install() 2009-07-29 16:44:51 -07:00
Bharat Mediratta
7438a9c889 Remove some scary debug code. 2009-07-29 16:40:01 -07:00
Tim Almdal
ead6a61d9e Fix for ticket #576 
Add a weight index to the item table and changed the retrieval of the maximum
weight to select weight from items order by weight desc limit 1.

Upgrades the gallery module to version 10

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-30 01:59:07 +08:00
Tim Almdal
653c291d94 Fix for ticket #576 
Add a weight index to the item table and changed the retrieval of the maximum
weight to select weight from items order by weight desc limit 1.

Upgrades the gallery module to version 10
 2009-07-29 10:55:56 -07:00
Tim Almdal
a533099e8a Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-29 05:17:25 -07:00
Bharat Mediratta
e6d6e498c0 Adjust the velocity based on whether or not we're waiting for more 
updates to get smoother scrolling.
 2009-07-28 21:21:09 -07:00
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