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
..
AssetAdmin.css	ENHANCEMENT Changed AssetAdmin interface 'delete' action to behave same as main CMS interface: Show 'batch actions' with dropdown. Added AssetAdmin_DeleteBatchAction class.	2009-11-21 03:19:05 +00:00
cms_left.css	BUGFIX: Pages that you can't edit should always be grey, even if there are unpublished changes.	2011-02-02 17:52:57 +13:00
cms_right.css	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
CMSMain.css	BUGFIX: #4839 fixing the css floating on site report results	2009-12-17 01:25:25 +00:00
CommentAdmin.css	ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin	2011-02-02 17:53:38 +13:00
editor.css	MINOR: Renamed the broken link style to .ss-broken to avoid conflicts.	2009-10-11 00:08:07 +00:00
Image_iframe.css	ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.	2011-02-02 17:52:10 +13:00
layout.css	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
LeftAndMain_printable.css	Ticket #1498 - CSS cleanup after reset	2007-11-05 20:38:25 +00:00
MemberImportForm.css	ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm (merged and rewritten from r98750)	2011-02-02 17:52:43 +13:00
ModelAdmin.css	Merge branch '2.4'	2011-02-15 11:50:24 +13:00
ReportAdmin.css	!!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css.	2007-09-27 20:56:55 +00:00
SecurityAdmin.css	MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion (from r98883)	2011-02-02 17:53:00 +13:00
silverstripe.tabs.css	MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript	2011-02-02 17:52:04 +13:00
typography.css	MINOR: Fixed newlines and set svn:eol-style to native	2009-06-17 23:14:01 +00:00
unjquery.css	MINOR Styling of side reports and tree area in CMS	2009-11-21 03:21:08 +00:00
WidgetAreaEditor.css	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