Commit Graph
5668 Commits
Author SHA1 Message Date
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
jhilden ed9be09653 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-29 19:12:57 -04:00
jhilden 39559fdfd0 initial version of the the file with common CSS styles that should be reused if possible 2009-08-29 19:11:16 -04:00
Chad Kieffer 60cfa54b82 Fix error text color. 2009-08-29 17:02:43 -06: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
Bharat Mediratta 1527f149a9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-29 10:49:25 -07:00
Bharat Mediratta b833cb6073 Get rid of the task infrastructure. The multiple requests greatly
slow down simple operations.  We may run into problems with more
complex operations, but let's only add tasks into the mix when it's
clear that we need them.
2009-08-29 10:48:23 -07:00
Andy Staudacher 020281d932 Adding SafeString which is going to replace p::clean() and p::purify().
Refactoring of Xss_Security_Test.
t() and t2() return a SafeString instance.

TODO:
 - Update all code to use SafeString where appropriate.
 - Update golden fole of Xss_Security_Test
 - Stop reporting CLEAN vars in Xss_Security_Test
2009-08-29 10:45:47 -07:00
Andy Staudacher a2e2a2178b Using SafeString in album controller / view 2009-08-29 10:40:34 -07:00
Bharat Mediratta f257cd3d69 Major refactor of organize:
* Clean up naming conventions for variables in the controller
  so that we specifically refer to albums with $album_id, etc.

* Move complexity for drawing tree out of the controller and into
  the view.

* Simplify task definitions to get rid of extraneous text

* Change __PLACEHOLDERS__ to clearly define which is the album
  and which is the item that we're moving before/after

* Remove as many CSS ids as we can from the tree view to keep
  things simple
2009-08-29 10:00:47 -07:00
Bharat Mediratta acce8cbafd Log the actual exception details, before swallowing the exception. 2009-08-29 08:47:44 -07:00
jhilden b518a5173d Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 20:54:20 -04:00
jhilden c234f9fd39 improved translations admin interface 2009-08-28 20:53:06 -04:00
Chad Kieffer 210ba966f8 Fixed issue where button classes and cancel link weren't being re-applied to forms when an open dialog is reloaded. 2009-08-28 18:20:56 -06:00
Chad Kieffer 974e8f9547 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 16:38:02 -06:00
Chad Kieffer fc1c4d5119 Button styles and event handlers weren't being applied in dialogs, fixes #669. 2009-08-28 16:37:14 -06:00
Tim Almdal 1ce8643b80 Fix for #440. Basically add a check that the mysql version is > 5.0.0.
It was felt that actually listing the requirements might be overwhelming
to novice users.
2009-08-28 15:17:07 -07:00
Chad Kieffer d1a44af862 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 15:50:52 -06:00
Bharat Mediratta cb2171d082 Display the sort order in the Organize dialog, and allow users to
change the sort order on the fly.
2009-08-28 14:27:37 -07:00
Chad Kieffer c428e49f32 Make gMessage 100% of the width of its container. 2009-08-28 15:24:21 -06:00
Tim Almdal 31d63a0d0a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-28 13:47:36 -07:00
Tim Almdal 1d5262f9c3 Fix ticket #591: reCaptcha always on the page.
1) move creating the "Add a comment" button into the comments.html.php
2) use $.get() to retrieve the comment add form
2009-08-28 13:44:01 -07:00