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
..
email	ENHANCEMENT Moved UserDefinedForm and related code, templates, CSS and javascript out of cms and sapphire classes into userforms/trunk	2008-09-29 03:18:23 +00:00
Includes	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
AssetAdmin_uploadiframe.ss	MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.	2011-02-02 17:53:16 +13:00
BlankPage.ss	BUGFIX #2987 - IE8 support via IE7 compatability mode	2008-11-07 00:41:11 +00:00
CMSMain_versions.ss	ENHANCEMENT: Renamed Author column to User in the page version history to better reflect that they might not have been authors, and just iniators of workflow actions. (from r89015) (from r96793)	2010-04-12 09:59:01 +00:00
LeftAndMain_printable.ss	BUGFIX #2987 - IE8 support via IE7 compatability mode	2008-11-07 00:41:11 +00:00
LeftAndMain.ss	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
ModelSidebar.ss	ENHANCEMENT ajshort: Add the ability to overload getModelForms() and add new custom model sidebars.	2009-05-16 05:58:54 +00:00
ReportAdminForm.ss	MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)	2011-02-02 17:53:35 +13:00
SSReportTableField_printable.ss	MINOR set Print flag correctly on TLF	2010-05-28 02:32:34 +00:00
ThumbnailStripField.ss	ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS	2008-11-13 04:55:23 +00:00
WidgetAreaEditor.ss	ENHANCEMENT Added visual elements to aid in the usability of the WidgetAreaEditor	2010-04-13 22:20:28 +00:00
WidgetDescription.ss	MINOR: visual tweaks to the widgets area including widget titles can now be spread over multiple lines and padding between columns. #4965	2011-02-02 17:52:30 +13:00
WidgetEditor.ss	rbarreiros: #1918 Translate newsletter and other strings	2008-01-10 03:28:13 +00:00