stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-30 03:30:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Almdal 5a677975d0 Remove debugging print statement in search.php 2009-07-29 10:25:50 -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 2d770f1d27 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-28 13:31:42 -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 69f9aea5db Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-28 05:03:49 -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 975a5ded7b Clean up amd simplify the tag processing: Only allow comma separators between 
phrases.  Using only 1 separator cleans up the javascript as well, as we
can use some of the jquery autocomplete to set the tag separator.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 09:16:57 +08:00
Tim Almdal 4b6775e614 Clean up amd simplify the tag processing: Only allow comma separators between 
phrases.  Using only 1 separator cleans up the javascript as well, as we
can use some of the jquery autocomplete to set the tag separator.
 2009-07-27 18:04:55 -07:00
Tim Almdal a4c807232a Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-27 15:49:20 -07:00
Tim Almdal ecc9203c23 Standardize the specification of tags. 
With this patch a comma(,) is the only valid tag separator.  Spaces
are allowed in tags and phrases no longer need to be specified with a
dot.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-28 06:28:31 +08: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 f21044ae1d Standardize the specification of tags. 
With this patch a comma(,) is the only valid tag separator.  Spaces
are allowed in tags and phrases no longer need to be specified with a
dot.
 2009-07-27 13:54:20 -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 482e223b60 Updating install.sql with the packaging script, basically re-adding the charset (utf8) expressions that were removed by merging in rledisez's left/right -> left_ptr/right_ptr changes. 2009-07-26 23:58:46 -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
Chad Kieffer ca4f03b93e Backed out vAlign change, it isn't working. 2009-07-26 16:32:42 -06:00
Chad Kieffer a7af9bb456 Missed committing the gBanner addition to the view template. 2009-07-26 16:02:53 -06:00
Chad Kieffer 04ed02fedd Updated wording of tag separator tip 2009-07-26 15:57:26 -06:00
Chad Kieffer ab02c2a40b Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-26 10:54:44 -06:00
Chad Kieffer 26117accb6 Update to how gSiteMenu is positioned. Required addition of a new container, gBanner. This will ensure proper positioning across most browsers and simplifies gBreadcrumbs styles. Removed inaffective IE opacity style. 2009-07-26 10:54:21 -06: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
Chad Kieffer dcc3249f21 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-26 09:24:36 -06: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
Chad Kieffer 8f9b5dcf83 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-25 19:33:11 -06: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
Tim Almdal 00cd2b646d fix for ticket #574. The user->url database wasn't being set when the user was updated via the admin panel. 2009-07-25 15:00:57 -07:00
Tim Almdal 7a6952720c Pass the variable when the "user_edit_form" event is fired. 2009-07-25 14:48:10 -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
Chad Kieffer eca46d76a7 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-25 09:25:31 -06: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