Sam Minnee 3498e41b0a Merge branch '2.4' ... Conflicts: _config.php code/AssetAdmin.php code/AssetTableField.php code/CMSBatchAction.php code/CMSBatchActionHandler.php code/CMSMain.php code/CMSSiteTreeFilter.php code/CommentAdmin.php code/CommentTableField.php code/GroupImportForm.php code/LeftAndMain.php code/MemberImportForm.php code/MemberTableField.php code/ModelAdmin.php code/PermissionRoleAdmin.php code/ReportAdmin.php code/SecurityAdmin.php code/SideReport.php code/reports/BrokenLinksReport.php code/sitefeatures/MathSpamProtection.php code/sitefeatures/PageComment.php code/sitefeatures/PageCommentInterface.php code/sitefeatures/SSAkismet.php css/cms_left.css css/cms_right.css css/layout.css css/silverstripe.tabs.css images/loading.gif javascript/AssetAdmin.js javascript/AssetTableField.js javascript/CMSMain_left.js javascript/CMSMain_right.js javascript/LangSelector.js javascript/LeftAndMain.Tree.js javascript/LeftAndMain.js javascript/LeftAndMain_right.js javascript/MemberImportForm.js javascript/MemberTableField.js javascript/ModelAdmin.js javascript/PageCommentInterface.js javascript/ReportAdmin_left.js javascript/ReportAdmin_right.js javascript/SecurityAdmin_right.js javascript/SideReports.js javascript/SideTabs.js javascript/SitetreeAccess.js javascript/TranslationTab.js javascript/WidgetAreaEditor.js javascript/lang/cs_CZ.js javascript/lang/en_US.js javascript/lang/sk_SK.js javascript/tinymce_ssbuttons/editor_plugin_src.js javascript/tinymce_ssmacron/editor_plugin_src.js lang/en_US.php templates/Includes/AssetAdmin_left.ss templates/Includes/AssetTableField.ss templates/Includes/CMSMain_left.ss templates/Includes/CommentTableField.ss templates/Includes/ModelAdmin_left.ss templates/Includes/SecurityAdmin_left.ss templates/PageCommentInterface.ss templates/PageCommentInterface_singlecomment.ss templates/ReportAdminForm.ss tests/CMSMainTest.php tests/CMSMainTest.yml tests/LeftAndMainTest.php tests/MemberTableFieldTest.php tests/MemberTableFieldTest.yml thirdparty/multifile/multifile.js		2011-02-15 11:50:24 +13:00
..
reports	MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas)	2011-02-02 17:53:48 +13:00
staticpublisher	BUGFIX: Fixed caching of homepage. (from r106122)	2010-10-15 02:36:25 +00:00
AssetAdmin.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
AssetTableField.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
CMSActionOptionsForm.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
CMSBatchAction.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
CMSBatchActionHandler.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
CMSMain.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
CMSMenu.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 17:53:44 +13:00
CMSMenuItem.php	BUGFIX CMSMenuItem constructor now calls parent to respect inheritance (from r83586)	2009-11-05 01:13:00 +00:00
CMSSiteTreeFilter.php	MINOR Fixed phpdoc documentation	2011-02-02 17:53:28 +13:00
Diff.php	BUGFIX: Prevent DataDifferencer from creating empty <ins /> and <del /> takes that confuse the browser.	2011-02-02 17:53:35 +13:00
FileList.php	Updating queries to be more DB agnostic	2008-11-24 09:30:41 +00:00
GroupImportForm.php	BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)	2011-02-02 17:53:06 +13:00
HTMLCleaner.php	MINOR Fixed phpdoc documentation	2011-02-02 17:53:28 +13:00
LeftAndMain.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
LeftAndMainDecorator.php	MINOR Renamed LeftAndMainDecorator (had wrong classname)	2009-01-06 02:16:47 +00:00
MemberImportForm.php	BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)	2011-02-02 17:53:06 +13:00
MemberTableField.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
ModelAdmin.php	BUGFIX: CSVBulkLoader import method now no longer requires files to end in '.csv'. Some projects want to import files in CSV format, but not of csv file type.	2011-02-02 17:53:46 +13:00
Report.php	BUGFIX Fixed SS_Report::unregister() parameter naming (fixes #5511, thanks ktauber)	2011-02-02 17:53:32 +13:00
ReportAdmin.php	MINOR Reverted r100484 as it was causing too many problems	2011-02-02 17:53:06 +13:00
SecurityAdmin.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
SideReport.php	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
StaticExporter.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 17:53:44 +13:00
ThumbnailStripField.php	ENHANCEMENT: Prevent image search queries all images in the site initially when the page is loaded	2011-02-02 17:53:42 +13:00
WidgetAreaEditor.php	MINOR Removed end php tag from WidgetAreaEditor	2011-02-02 17:52:26 +13:00