tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
88f67c5859
silverstripe-cms/templates/Includes
History
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_left.ss API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller 2011-02-02 17:53:50 +13:00
AssetTableField_Item.ss BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField (from r101375) 2010-10-04 06:08:13 +00:00
AssetTableField.ss API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller 2011-02-02 17:53:50 +13:00
CMSMain_left.ss API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller 2011-02-02 17:53:50 +13:00
CMSMain_rightbottom.ss Moved CMS module to open source path 2007-07-19 10:40:05 +00:00
CMSMain_TreeTools.ss MINOR Merged CanOrganiseSitetree permission into CMSMain_TreeTools.ss (originally implemented in r84073) 2009-11-22 08:23:16 +00:00
CMSTopMenu.ss ENHANCEMENT Using a simple target=_blank for opening the logo link in CMS instead of javascript 2009-11-21 02:36:15 +00:00
Editor_toolbar.ss BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT 2008-07-10 23:29:20 +00:00
LeftAndMain_right.ss API CHANGE Removed LeftAndMain->EditForm(), please use getEditForm() instead 2009-11-21 03:15:13 +00:00
LeftAndMain_rightbottom.ss Moved CMS module to open source path 2007-07-19 10:40:05 +00:00
MemberTableField.ss BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas) 2011-02-02 17:53:40 +13:00
ModelAdmin_ImportSpec.ss IMPROVEMENT moved managed models' forms to one panel (ticket #2898) 2008-11-05 08:55:07 +00:00
ModelAdmin_left.ss MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests 2011-02-02 17:53:33 +13:00
ModelAdmin_Results.ss BUGFIX Fixed old references to GenericDataAdmin in ModelAdmin.php and ModelAdmin_Results.ss 2008-10-24 03:45:39 +00:00
ModelAdmin.ss (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 2008-08-09 03:54:55 +00:00
ReportAdmin_left.ss Reimplementation for reports (#49) - removing unneeded code and remaking the template to use standard SiteTree functionality. 2009-11-21 03:18:28 +00:00
ReportAdmin_SiteTree.ss Reimplementation for reports (#49) - removing unneeded code and remaking the template to use standard SiteTree functionality. 2009-11-21 03:18:28 +00:00
SecurityAdmin_left.ss API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller 2011-02-02 17:53:50 +13:00
SubscribeSubmission.ss Added SubscribeSubmission template to get subscribeforms to work 2008-02-07 02:45:49 +00:00