Bharat Mediratta
db03c5d799
Don't try to move an item into its own descendant hierarchy. Just leave it out of the move for now.
2009-08-30 15:09:13 -07:00
Bharat Mediratta
dee0abfab9
Use is_descendant() API inside move_to() for clarity.
2009-08-30 15:04:39 -07:00
Bharat Mediratta
53390ba79a
CSS rename: gMicroThumbXxx -> gOrganizeMicroThumbXxx to make it clear
...
that this is organize only.
2009-08-30 14:58:26 -07:00
Bharat Mediratta
5cce88cd04
Rename gAlbumText to gOrganizeAlbumText for consistency since this is
...
an organize-only construct.
2009-08-30 14:50:53 -07:00
Bharat Mediratta
a498d37763
remove unused #gOrganizeDialog
2009-08-30 14:49:51 -07:00
Bharat Mediratta
c615918829
Manage the selection so we don't automatically select an album
...
whenever we expand a tree.
2009-08-30 14:40:55 -07:00
Bharat Mediratta
d1ade6620e
Precalculate the organize tree based on the selected album and render
...
it right away while still allowing incremental tree loading.
2009-08-30 14:35:27 -07:00
Bharat Mediratta
af6bfa3c71
Change the processing time for search_task and exif_task to start the
...
1.5 second counter only after we've done any expensive queries. This
guarantees at least some time to do work.
Fixes ticket #693 .
2009-08-30 13:29:05 -07:00
Andy Staudacher
b5813f92c7
Improve no_tabs test to print out a complete list of files + line numbers + line snippet.
2009-08-30 07:42:37 -07:00
Andy Staudacher
22aa0b3092
Add $theme-> methods to Xss whitelist for HTML safety.
...
Updating XSS golden file.
2009-08-30 07:25:49 -07:00
Andy Staudacher
effccfd41d
Change all instances of SafeString::of_safe_html() to html::mark_safe() in views.
2009-08-30 07:00:56 -07:00
Andy Staudacher
52b542b253
Fixing typo
2009-08-30 06:55:24 -07:00
Andy Staudacher
d3b0302690
Minor cleanup
2009-08-29 23:15:28 -07:00
Andy Staudacher
b9bd1681a3
Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly.
2009-08-29 22:54:20 -07:00
Andy Staudacher
952c885609
Adding html::clean(), ::purify(), etc.
2009-08-29 22:31:23 -07:00
Bharat Mediratta
4bc7165dab
Delete obsolete comment and tighten the code in site_menu().
2009-08-29 16:42:33 -07:00
Bharat Mediratta
878b9c91b2
Remove try/catch in resize() since that will swallow any exceptions
...
that we generate when resizing.
2009-08-29 16:38:53 -07:00
Bharat Mediratta
a2258b2232
Merge branch 'master' of git@github.com:gallery/gallery3
2009-08-29 16:34:41 -07:00
Bharat Mediratta
483d8df91b
Change the organize tree to expand/collapse. It doesn't properly open
...
up to the album that you're viewing, and if you move a photo to a
different album it'll reload the entire album tree.
2009-08-29 16:33:22 -07:00
Andy Staudacher
b4b638be44
Undo url helper changes - url methods no longer return a SafeString.
...
Adding SafeString::of_safe_html() calls where urls are passed as parameters to t() and t2().
2009-08-29 16:28:30 -07:00
jhilden
a1ce2d3f0a
you can close the l10n client directly from its interface now, without going back to the languages admin page
2009-08-29 19:19:04 -04:00
Andy Staudacher
0204617b60
XSS fixes
2009-08-29 15:41:02 -07:00
Tim Almdal
0aceba6f48
Fix for ticket #628 :
...
1) increased gallery module version to 11
2) added image_sharpened parameter to the gallery module
3) sharpen all resizes.
2009-08-29 15:20:27 -07:00
Tim Almdal
a5ddef021c
Fix invalida syntax on trying to parse the progress bar percentage
2009-08-29 15:03:46 -07:00
Andy Staudacher
c4d5ecde66
L10n fixes for the admin_languages page, and JS/XSS cleanup of the organize views.
2009-08-29 14:38:47 -07:00
Andy Staudacher
f327b4ad38
Fix link in l10n UI (for SafeString changes)
2009-08-29 14:24:52 -07:00
Andy Staudacher
a5dfc81a8f
Merge commit 'upstream/master'
...
Conflicts:
modules/akismet/views/admin_akismet.html.php
modules/comment/helpers/comment_rss.php
modules/gallery/helpers/gallery_rss.php
modules/gallery/libraries/I18n.php
modules/gallery/views/permissions_browse.html.php
modules/gallery/views/simple_uploader.html.php
modules/info/views/info_block.html.php
modules/organize/controllers/organize.php
modules/organize/views/organize.html.php
modules/organize/views/organize_album.html.php
themes/default/views/album.html.php
themes/default/views/movie.html.php
themes/default/views/photo.html.php
2009-08-29 14:17:48 -07:00
Andy Staudacher
d5660d2d3e
Fixing all detected XSS vectors in PHP->JS code.
...
Xss: Rename UNKNOWN back to DIRTY, JS_XSS to DIRTY_JS.
(using a different flag value to highlight potential XSS vectors in JS)
2009-08-29 13:41:18 -07:00
Chad Kieffer
a9fcec755a
Merge branch 'master' of git@github.com:gallery/gallery3
2009-08-29 14:02:29 -06:00
Chad Kieffer
5db0b68a70
Update status message styles. Lighten backgrounds, don't show background on Admin Maintenance rows, and added gModuleStatus class.
2009-08-29 14:01:04 -06:00
Andy Staudacher
83344b9e7d
Bugfix: Don't forget to copy the _is_purified_html flag when cloning a SafeString.
2009-08-29 12:50:20 -07:00
Andy Staudacher
c01ac42c46
Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
...
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-29 12:48:40 -07:00
Andy Staudacher
a10063ff68
Add more factory methods for convenience:
...
SafeString::purify() and SafeString::of_safe_html().
Removing SafeString::mark_html_safe() since it's no longer needed.
2009-08-29 12:34:09 -07:00
Bharat Mediratta
6b633e8748
Merge branch 'talmdal_branch' of git@github.com:gallery/gallery3
2009-08-29 12:24:44 -07:00
Bharat Mediratta
cd1fd4989f
Add a test for Comment_Model::viewable().
2009-08-29 12:22:00 -07:00
Bharat Mediratta
50c624ed1b
Fix active() to not use user::guest() as the fallback for our Session::get() call.
2009-08-29 12:20:03 -07:00
Bharat Mediratta
0d16cc1c10
Clean up the test and get it working.
2009-08-29 12:12:53 -07:00
Andy Staudacher
7adb9ea2e3
Adding SafeString::for_html_attr()
2009-08-29 11:48:55 -07:00
Bharat Mediratta
d85a8b20bb
Rename $comment_model to $comments.
2009-08-29 11:48:49 -07:00
Tim Almdal
38b2efc44c
Fix for 641... extend viewable functionality to comments. Viewable unit test is not working.
2009-08-29 11:43:10 -07:00
Bharat Mediratta
35f83ff31d
Merge branch 'master' of git@github.com:gallery/gallery3
2009-08-29 11:33:29 -07:00
Andy Staudacher
1d633457c4
Have url::site() and other methods return a SafeString, just as t() and t2().
...
Benefits:
- url::site() is often used in views and we can ensure in the url class that returned strings are indeed safe for use in HTML. Makes the list of vars of unknown safety status shorter.
- url::site() is often used as message parameter to t() and t2(). The parameter would be HTML-escaped if it wasn't marked as safe HTML already. Makes the usage simpler / shorter.
2009-08-29 11:31:00 -07:00
jhilden
22c7f44d0b
Merge branch 'master' of git@github.com:gallery/gallery3
2009-08-29 14:29:54 -04:00
Bharat Mediratta
775987dff9
Fix a bug where organize doesn't properly generate the tree at the root album.
2009-08-29 11:29:38 -07:00
jhilden
746609b967
* created new generic "Add" dropdown in the site menu. this should take care of ticket #537
...
* removed start/stop translation menu items from the admin, since they are on the languags admin page now
2009-08-29 14:27:08 -04:00
Tim Almdal
27b81257fa
Standardize the access to the create_random_item method
2009-08-29 11:24:12 -07:00
Tim Almdal
08d7fda7f8
Merge branch 'master' of git://github.com/gallery/gallery3
2009-08-29 11:22:19 -07:00
jhilden
8d256898c7
improved translation interface so that it now can be closed without going to the admin
2009-08-29 14:21:53 -04:00
Tim Almdal
6de10a54dd
Fix typo in the parameter list
2009-08-29 11:21:30 -07:00
Bharat Mediratta
4408ed0684
Remove stray blank line.
2009-08-29 10:56:35 -07:00