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

..

selenium

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

Access_Helper_Test.php

Back out the fix for ticket #452

2009-07-27 11:13:20 -07:00

Album_Helper_Test.php

Update tests to reflect cache-buster param on thumbnail urls.

2009-05-28 01:58:41 -07:00

Albums_Controller_Test.php

Improve test isolation so that Albums_Controller_Test doesn't fail when run with Photos_Controller_Test

2009-06-02 14:19:03 -07:00

Cache_Test.php

Revert to serializing and deserializing data. The cache table can't

2009-06-29 20:53:55 -07:00

Database_Test.php

Rename columns that use reserved SQL words : items.left and items.right

2009-07-25 19:06:54 +02:00

Dir_Helper_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

DrawForm_Test.php

Create A Forge Script element. Form_Script allows the specification

2009-07-28 12:04:23 +08:00

File_Structure_Test.php

Add quotes around all values that contain spaces in them, and add a

2009-07-13 10:36:55 -07:00

Gallery_Installer_Test.php

Rename columns that use reserved SQL words : items.left and items.right

2009-07-25 19:06:54 +02:00

I18n_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

Item_Helper_Test.php

Clean up the test and get it working.

2009-08-29 12:12:53 -07:00

Item_Model_Test.php

Standardize the access to the create_random_item method

2009-08-29 11:24:12 -07:00

Menu_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

Movie_Helper_Test.php

Update all references to the core application to now point to the

2009-05-27 16:17:29 -07:00

ORM_MPTT_Test.php

Change the children and descendants APIs to be more consistent and to

2009-08-05 10:38:53 -07:00

Photo_Helper_Test.php

Rename columns that use reserved SQL words : items.left and items.right

2009-07-25 19:06:54 +02:00

Photos_Controller_Test.php

Improve test isolation so that Albums_Controller_Test doesn't fail when run with Photos_Controller_Test

2009-06-02 14:19:03 -07:00

REST_Controller_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

REST_Helper_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

SafeString_Test.php

Add more factory methods for convenience:

2009-08-29 12:34:09 -07:00

Sendmail_Test.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

test.jpg

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

Var_Test.php

Update all references to the core application to now point to the

2009-05-27 16:17:29 -07:00

xss_data.txt

Revert "Allow a theme to override the page refresh mechanism. Create a new"

2009-08-05 09:24:27 -07:00

Xss_Security_Test.php

Fixing all detected XSS vectors in PHP->JS code.

2009-08-29 13:41:18 -07:00