Commit Graph

3624 Commits

Author SHA1 Message Date
Romain LE DISEZ
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 DISEZ
7c7d4c0ec0 Consistency : always use self::XXX
(cherry picked from commit c9017ae2f2)
2009-07-23 09:12:08 -07:00
Romain LE DISEZ
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
Bharat Mediratta
5999ccb512 Remove extra error log line 2009-07-23 08:40:00 -07:00
Bharat Mediratta
6a8cace027 Test cleanup:
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-23 08:37:39 -07:00
Tim Almdal
7c2cea01a5 Fix for ticket #502
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-23 07:02:10 -07: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
c8d215bf80 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-22 14:28:33 -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
Tim Almdal
427e1130b2 Modified the notification get_subscribers to ignore any users that don't
have "view" access to the item the notification is being generated for.
Fix for ticket: #538.
2009-07-22 11:11:48 -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
Bharat Mediratta
0546f0df13 Fix the bug that the quick menu fires for the wrong photo. This stems
from using a single gQuickPane <div> that we move around.  A race
condition happens when you mouse over two thumbnails quickly.
Whichever server response loses the race gets displayed, and sometimes
it's the one that you're no longer hovering over.

Fix it by changing gQuickPane to be a class and creating a <div> per
thumbnail.

Fixes ticket #290.
2009-07-21 13:39:40 -07:00
Bharat Mediratta
80f48b084a In the logout link, urlencode the continue url so that ampersands, etc
don't break encapsulation.  In the logout controller, don't run the
url through url::redirect because that uses url::site().  Just set the
Location header directly.

This fixes ticket #483.
2009-07-21 13:02:20 -07:00
Bharat Mediratta
f83db99d39 Properly display thumbnails for private movies by backtracking from
the thumbnail to the movie and then showing it as a JPG.  Fixes ticket
#570.
2009-07-21 12:26:16 -07:00
Bharat Mediratta
8f1bca7459 Remove the fallback code. It should trigger extremely rarely and seems highly inefficient to me, so let's see if we can live without it. 2009-07-21 12:18:49 -07:00
Bharat Mediratta
90ba320655 The RSS link should go to the parent album when looking at photos/movies.
Fixes ticket #566.
2009-07-21 11:25:03 -07:00
Bharat Mediratta
2de6b77d61 Use php_uname() instead of PHP_OS for greater accuracy. Fixes ticket #563. 2009-07-21 11:20:36 -07:00
Bharat Mediratta
050c82cf80 Escape bare & symbols so that we use valid entities. Fixes ticket #577. 2009-07-21 11:09:23 -07:00
Romain LE DISEZ
00b3ca82de Merge commit 'upstream/master' 2009-07-20 18:46:41 +02:00
Shai Ben-Naphtali
fb7d99740d Changed "Forgot Your Password" text to use capital 'Y' on the word Your
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-21 00:09:06 +08:00
Bharat Mediratta
60d6058880 Make some API changes simplify the tag editing code. We now have a
good pattern for allowing modules to add their own hooks to item forms!

1) Album, photo and movie forms now all use edit_item as the group and
   we publish item_edit_form and item_edit_form_completed events which
   makes it much easier in the module to handle all events.  They can
   still differentiate based on $item->type if they want to.

2) Added tag::clear_all() and tag::compact() functions which takes the
   place of hiwilson's tag::update() function and is now used in
   tag_event::item_delete().  This provides a simple API that allows
   us to have a lot less event handling code.  It's less efficient
   than what hiwilson was doing before in that it will delete and
   re-add tags, but if that ever turns out to be a performance issue
   we can do something about it then.
2009-07-20 08:51:12 -07:00
hiwilson
709d6c5faf (1)Add tag edit field in album/photo edit form. (2)provide edit functionality. (3)support multi-word tagging. 2009-07-20 08:02:07 -07:00
Romain LE DISEZ
d3fa2bed68 Merge commit 'upstream/master' 2009-07-20 10:49:47 +02:00
Bharat Mediratta
51dca582cd More thorough fix for #421. Create User_Model::display_name() which
uses the full name if there is one, or falls back to the name if
that's all we have.
2009-07-19 16:50:35 -07:00
Bharat Mediratta
59e410bb79 Updated for movieplayer.html.php update 2009-07-21 07:25:34 -07:00
Bharat Mediratta
d7814f37cb Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-20 22:23:34 -07:00
Bharat Mediratta
ce963c9db0 Remove the access permission call from here; this is too low level. 2009-07-20 22:23:21 -07:00
Shai Ben-Naphtali
b99774ac49 Fixed grammer and set lowercase for the word project (minor change)
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-21 13:19:07 +08:00
Shai Ben-Naphtali
5a0424f458 Fix some consistency in text.
This fixes ticket #546

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-21 13:18:59 +08:00
Bharat Mediratta
67e83e66c6 Fix indentation 2009-07-20 22:12:39 -07:00
hiwilson
653badc2e1 set wmode='transparent' other than flowplayer.js
(cherry picked from commit 79a46658196a98a3972983cc422d1ee544b09d4a)
2009-07-20 22:11:22 -07:00
Bharat Mediratta
1a96ce145c Don't let the task status message exceed the size of the status column when there's an error. 2009-07-20 20:47:47 -07:00
Bharat Mediratta
3aea4dd118 Dump out the error message along with the stack trace when we catch an
exception from View::render()
2009-07-20 18:47:32 -07:00
Andy Staudacher
33d0b82d02 Fix l10n message inconsistency, ticket 546 2009-07-19 15:45:16 -07:00
Andy Staudacher
1ab8bf07ad Html validation fix, ticket 572 2009-07-19 15:36:17 -07:00
Bharat Mediratta
b3f91167c1 Remove excess success logging. In the rebuild images case, it can
make a huge log file.  In the l10n_client case, it's not really
necessary to know that level of detail and it makes for a weird API.
2009-07-19 13:55:22 -07:00
Bharat Mediratta
bad6d21584 Remove success logging from exif_task. 2009-07-19 13:48:38 -07:00
Bharat Mediratta
5ee2e3e02c Create tag::item_tags which returns all the tags for any one item. 2009-07-19 13:46:22 -07:00
Bharat Mediratta
788a458a11 Remove success logging. Only log on errors, otherwise the log is huge. 2009-07-19 13:43:06 -07:00
Bharat Mediratta
c461881110 Don't post the item_updated() event if we're just updating the view count. 2009-07-19 13:20:08 -07:00
hiwilson
0e4a7a5133 make tags to be searchable. work with a5eef648c0
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-20 04:06:58 +08:00
Romain LE DISEZ
aeff79b634 Merge commit 'upstream/master' 2009-07-19 01:21:00 +02:00