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
2,503 Commits 29 Branches 403 Tags 28 MiB
a3bd51e388
Commit Graph

31 Commits

Author SHA1 Message Date
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +13:00
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
Ingo Schommer
99b5937f42 MINOR Fixed phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103397 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:28 +13:00
Sam Minnee
79968d0814 API CHANGE: Added capability for batch actions to indicate failure through red checkboxes (from r94868) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96824 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:18 +13:00
Sam Minnee
27907e4ced API CHANGE: Added canView() to CMSBatchAction so that you could hide certain batch actions from some users. (from r94846) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96823 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:18 +13:00
Sam Minnee
ee2490fe68 API CHANGE: Added applicablePagesHelper to CMSBatchAction to ease the process of creating new applicable page methods. 
ENHANCEMENT: Added applicable pages checks to delete from live, delete from draft, and publish (from r94775)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96821 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:17 +13:00
Sam Minnee
d85d2bd1c9 MINOR: Made delete from draft batch action text more consistent with published. (from r91839) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96813 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:16 +13:00
Sam Minnee
a3306e8834 BUGFIX: Correct labels for "delete from draft" batch actions (from r91838) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96812 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:16 +13:00
Sam Minnee
2cf10e76fe MINOR added batch deletion back for workflow (from r88916) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96789 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:12 +13:00
Ingo Schommer
d6a2e66c89 MINOR removed concurrent editing (merged from r91198) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:03 +13:00
Sean Harvey
9b49ebf8b4 BUGFIX Fixed pages not being manipulated properly in the CMS because of a PHP error in CMSBatchAction 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90936 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:03 +13:00
Ingo Schommer
2d3bb7de3e MINOR Making controller/response optional in CMSBatchAction->batchaction() in order to make the class more testable in isolation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115128 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-16 08:33:06 +00:00
Ingo Schommer
4d0362ba64 API CHANGE: Added canView() to CMSBatchAction so that you could hide certain batch actions from some users. (from r94846) (from r96823) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102687 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 04:24:48 +00:00
Ingo Schommer
feeb1e40fa API CHANGE: Added applicablePagesHelper to CMSBatchAction to ease the process of creating new applicable page methods. 
ENHANCEMENT: Added applicable pages checks to delete from live, delete from draft, and publish (from r94775) (from r96821)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102680 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 03:58:16 +00:00
Ingo Schommer
99eb135198 MINOR: Made delete from draft batch action text more consistent with published. (from r91839) (from r96813) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102675 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 03:53:50 +00:00
Ingo Schommer
8a0f639977 MINOR Fixed merge error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 10:05:08 +00:00
Ingo Schommer
791dc22e5d MINOR added batch deletion back for workflow (from r88916) (from r96789) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102481 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:57:31 +00:00
Ingo Schommer
c18923040d MINOR Fixed merge error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92842 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:43 +00:00
Ingo Schommer
d081a4b302 MINOR Fixed CMSBatchAction ID retrieval 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92741 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:16:32 +00:00
Ingo Schommer
44e16b9620 API CHANGE Removed CMSBatchAction->getDoingText(), is now using button loading indicators in the UI 
API CHANGE Removed LeftAndMain->BatchActionList(), no longer necessary as we're creating the batch actions form in the same class
ENHANCEMENT Changed CMSBatchAction logic to return JSON status changes rather than eval'ed JavaScript via FormResponse
ENHANCEMENT Ported batchactions in CMSMain_left.js to concrete javascript, and moved to new CMSMain.BatchActions.js file
ENHANCEMENT Using native CMSMain->BatchActionsForm() to render form instead of custom template markup in CMSMain_TreeTools.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92722 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:15:40 +00:00
Ingo Schommer
0b9f4ab533 MINOR Adjusted to SiteTree->getTreeTitle() api change 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92669 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:38:59 +00:00
Tom Rix
5f548f5901 MINOR fixed undefined var 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91314 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-11 20:59:05 +00:00
Tom Rix
d22e4d17a0 MINOR removed concurrent editing 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91198 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-10 21:14:08 +00:00
Ingo Schommer
c59911dce2 MINOR Correct labels for "delete from draft" batch actions (#4420) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-04 22:56:29 +00:00
Tom Rix
c33022f987 MINOR fix failing tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 03:27:27 +00:00
Tom Rix
8e2a5bf7c6 MINOR update batchactions to state how many failed to process 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90489 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 00:55:37 +00:00
Sam Minnee
a7c07369e0 FEATURE batch actions for setting/resetting embargo/expiry (from r85397) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89221 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:44:08 +00:00
Tom Rix
07a61a19a5 MINOR don't call TreeTitle on a node if it's being removed. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-02 21:57:26 +00:00
Sam Minnee
ef2c47feb8 BUGFIX: Fixed query syntax issues for db abstraction. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77556 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-21 05:11:14 +00:00
Ingo Schommer
491118381c MINOR Package documentation for CMSBatchAction* classes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76878 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 21:56:35 +00:00
Sean Harvey
46bf3ce2d2 Added missing classes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76876 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 21:51:54 +00:00