Commit Graph
2269 Commits
Author SHA1 Message Date
Tim Almdal 33bcf11e27 Change the Html_Helper and SafeString tests to change the expeced results based on whether HtmlPurifier module is installed or not 2009-09-03 01:05:03 -07:00
Tim Almdal 3dc7e2e78c Merge branch 'master' into talmdal 2009-09-02 23:53:35 -07:00
Chad Kieffer 6feab02c86 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-02 22:36:19 -06:00
Chad Kieffer 02409d3b99 Fix bg images in tables bug in webkit and ie. #718 2009-09-02 22:35:54 -06:00
Bharat Mediratta d007f31686 Undo rest of the indentation issue accidentally created in 8312eb and
partially fixed in 2c30dc
2009-09-02 21:29:22 -07:00
Bharat Mediratta 9237ab9bc1 Change graphics::generate() API so that it doesn't return a boolean,
instead it throws an exception if there's a problem.  The normal case
for graphics::generate is that it's going to succeed.  It'll only fail
if something un-handleable went wrong, so just use the resulting
exception.
2009-09-02 15:29:00 -07:00
Tim Almdal de61da5bfc Merge branch 'master' into talmdal 2009-09-02 14:29:00 -07:00
Tim Almdal 2c30dc2d5b fix a leading space that was causing the file_structure_test to fail 2009-09-02 14:28:00 -07:00
Tim Almdal aea34882b4 Merge branch 'master' into talmdal 2009-09-02 13:44:37 -07:00
Bharat Mediratta b842a9d9ca Fix formatting, and use a properly named file in
change_photo_no_csrf_fails_test() so that GD doesn't bomb.
2009-09-02 11:58:04 -07:00
Bharat Mediratta b9293755c0 Deal with the aftermath of adding sharpen() calls. Since GD does not
support it, this causes crashes as soon as you try to use it, which
breaks a bunch of our tests.  Also, give the user some idea that
sharpen() is missing in the UI.  Fixes #689.
2009-09-02 11:57:20 -07:00
Bharat Mediratta a09a6a06be Refactor how we use $this->relative_path() so that we're not calling
it twice on both sides of a ternary operator.
2009-09-02 11:28:41 -07:00
Tim Almdal f2bbb2963a Remove debugging statementes 2009-09-02 07:07:47 -07:00
Tim Almdal 7fbd012d71 Move HTMLPurifier from core to contrib and make it optional. Delete the modules/gallery/lib and HTMLPurifier.php 2009-09-02 07:06:28 -07:00
Bharat Mediratta ecc0d89cd4 Fix up incorrectly applied html::mark_clean(). Resolves #698, thanks fperwth! 2009-09-01 20:34:19 -07:00
Bharat Mediratta b14b9e0d7b Allow anything to be made an album cover, except for direct children
of the root album (which has no visible album cover, so no point in
offering that option).  This fully resolves #705.
2009-09-01 20:23:44 -07:00
Andy Staudacher 95ea310aff Remove unused l10n message 2009-09-01 14:39:08 -07:00
Andy Staudacher b50d7f0d69 Fix bug #522 - Handle "save settings" correctly in the "share translations" form. 2009-09-01 11:11:22 -07:00
Andy Staudacher 295fc0c14c Merge commit 'upstream/master' 2009-09-01 01:30:45 -07:00
Andy Staudacher fe37483aca Update XSS scanner golden file 2009-09-01 01:29:42 -07:00
Andy Staudacher 53711225ac XSS / style fixes for newly detected issues (after fixing XSS scanner) 2009-09-01 01:28:52 -07:00
Andy Staudacher d2cea7905e Remove debugging code 2009-09-01 00:53:17 -07:00
Andy Staudacher c0d4937e43 Fix bug in XSS scanner for <script> block @ position 0 of inline_html 2009-09-01 00:52:21 -07:00
Chad Kieffer 39ca803af7 Set CSS cursor to hand for jQuery UI ui-state-hover elements. Fixes all but progress bar cursor. #669 2009-08-31 23:51:27 -06:00
Chad Kieffer 7331e2e77c Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-31 23:16:35 -06:00
Chad Kieffer 19e49bea06 Don't include Make this the album's cover in context menu's for albums. #705 2009-08-31 23:07:17 -06:00
Andy Staudacher 285e2b9cbe Update XSS test golden file 2009-08-31 21:57:15 -07:00
Chad Kieffer 7b2c03c2b9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-31 22:56:11 -06:00
Andy Staudacher 5ca13fe5e8 Merge commit 'upstream/master' 2009-08-31 21:53:17 -07:00
Andy Staudacher 2bc73e2e36 Fix XSS vectors in HTML attributes (mostly t() calls) 2009-08-31 21:51:57 -07:00
Chad Kieffer 559f9a4b9d Add icons to context menu for albums. I'm open to other options, if folks think there's something better in the jQuery UI themeroller set. 2009-08-31 22:51:36 -06:00
Andy Staudacher 50c8b96405 Add XSS check for HTML attributes 2009-08-31 21:17:35 -07:00
Bharat Mediratta 81073aeb5b Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-31 21:11:57 -07:00
Bharat Mediratta c887170555 Stay on the same page when editing albums/movies/photos. Fixes ticket 2009-08-31 21:10:22 -07:00
Andy Staudacher 48050aca41 Add XSS check to ensure that html::js_string() is not preceded by a quote. 2009-08-31 19:53:53 -07:00
Andy Staudacher 8312eb116e XSS review fixes (mostly adding missing html::mark_clean()) calls. 2009-08-31 02:12:01 -07:00
Andy Staudacher 26f6d8192f Adding XSS test for href="javascript: and onclick="..." 2009-08-31 01:11:50 -07:00
Andy Staudacher ddb84c84e1 Rename mark_safe() to mark_clean() 2009-08-31 00:42:18 -07:00
Andy Staudacher 6d26b0dd6e Merge commit 'upstream/master' 2009-08-31 00:32:41 -07:00
Andy Staudacher afb0111fe6 Updating golden XSS-test data file 2009-08-30 21:36:14 -07:00
Andy Staudacher 0a0c7a78e6 Check for href="<?= $foo ?>" (malicious "javascript:..." string) 2009-08-30 21:25:21 -07:00
Andy Staudacher 3aef420d48 Updating XSS golden file 2009-08-30 18:37:01 -07:00
Andy Staudacher e7f5e0a9a3 Merge commit 'upstream/master'
Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php
2009-08-30 18:27:40 -07:00
Andy Staudacher df38a890a6 Tabs to spaces cleanup 2009-08-30 18:07:13 -07:00
Chad Kieffer 80ae2fe4bf Finish this pass at the Admin Maintenance view. Re-introduce status icons, put Cancel All, Delete All buttons in the action heading cell. 2009-08-30 23:51:31 -06:00
Chad Kieffer ce733e0f48 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-30 22:33:12 -06:00
Chad Kieffer 93b542ccd8 Apply hover effect to buttons in progress indicator dialog. 2009-08-30 22:32:23 -06:00
Andy Staudacher 00c73ec852 Updating uses of html::js_string and SafeString::for_js (value now contains string delimiters) 2009-08-30 15:34:46 -07:00
Andy Staudacher beb711d6a0 Rename clean_js to js_string and have it return a complete JS string (with delimiters) instead of just the string contents.
Benefits: Using json_encode(), which is very robust. And as a user, it's clearer how to use this API compared to what it was before.
2009-08-30 15:21:02 -07:00
Bharat Mediratta dee0abfab9 Use is_descendant() API inside move_to() for clarity. 2009-08-30 15:04:39 -07:00