tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-18 10:41:39 +02:00
Code Issues Projects Releases Wiki Activity
2,488 Commits 29 Branches 398 Tags 24 MiB
3498e41b0a
Commit Graph

47 Commits

Author SHA1 Message Date
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
Sean Harvey
27aad3deca BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:53 +13:00
Sean Harvey
77c5701fa6 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:53 +13:00
Ingo Schommer
bc3df654bd 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 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:50 +13:00
Ingo Schommer
a010ab82a3 MINOR Made CMSMainTest more resilient against database ID changes (Postgres doesn't have auto-increment resets across tests at the moment) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106248 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:42 +13:00
Sam Minnee
faa17fd2ce MINOR: Fixed test that required a separate Page table. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106090 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:41 +13:00
Sam Minnee
9bf0b7a6ba MINOR: Added test for #5657 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106081 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:40 +13:00
Ingo Schommer
dbec9a4c8a MINOR Fixed SapphireTest->logInWithPermission() spelling 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99492 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:57 +13:00
Ingo Schommer
a7ede59221 MINOR refactored setting/getting strict hierarchy setting. (from r98654) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99126 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:54 +13:00
Ingo Schommer
340230b9c9 MINOR more unit tests around loose hierarchy (from r98509) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99121 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:51 +13:00
Frank Winkelmann
48a7c1ee87 BUGFIX: Ticket #4805 
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98001 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:29 +13:00
Sam Minnee
4f07a30a6b MINOR: Fixed CMSMainTest to be more flexible about modules altering the buttons. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96827 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:18 +13:00
Sam Minnee
27f3dfc6ed BUGFIX: Fixed viewing of deleted pages. (from r89833) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96795 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:13 +13:00
Sam Minnee
b7181a832f MINOR: Make CMSMainTest compatible with cmsworkflow module. (from r89030) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96794 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:13 +13:00
Sean Harvey
22ac12c0c5 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-14 01:29:38 +00:00
Geoff Munn
390eaf93b7 MINOR: hard-coded IDs replaced 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113677 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-11 22:26:39 +00:00
Ingo Schommer
66f2fad70a MINOR Made CMSMainTest more resilient against database ID changes (Postgres doesn't have auto-increment resets across tests at the moment) (from r106248) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112578 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:31:30 +00:00
Ingo Schommer
88b2fbb90c MINOR: Fixed test that required a separate Page table. (from r106090) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112487 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:35:52 +00:00
Ingo Schommer
376e7bf3b0 MINOR: Added test for #5657 (from r106081) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:35:17 +00:00
Sam Minnee
b0b542d500 MINOR Fixed SapphireTest->logInWithPermission() spelling (from r99492) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112076 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 02:06:29 +00:00
Sam Minnee
11fac7c0c6 MINOR refactored setting/getting strict hierarchy setting. (from r98654) (from r99126) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111607 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:29:48 +00:00
Sam Minnee
2d02afc3f4 MINOR more unit tests around loose hierarchy (from r98509) (from r99121) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111605 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:27:20 +00:00
Ingo Schommer
24fb77ab73 MINOR Fixed typo 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@103669 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-28 07:16:31 +00:00
Ingo Schommer
6ea662cd05 MINOR Changed CMSMainTest to use new LeftAndMain->doAdd() controller actions, not the removed addform() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102787 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 03:07:25 +00:00
Ingo Schommer
fe543edcd6 BUGFIX: Ticket #4805 
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml (from r98001)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102749 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 01:36:42 +00:00
Ingo Schommer
c9df94a7af MINOR: Fixed CMSMainTest to be more flexible about modules altering the buttons. (from r96827) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 06:57:30 +00:00
Ingo Schommer
d81cae7dfd BUGFIX: Fixed viewing of deleted pages. (from r89833) (from r96795) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102486 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 10:08:00 +00:00
Ingo Schommer
444e192068 MINOR: Make CMSMainTest compatible with cmsworkflow module. (from r89030) (from r96794) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102484 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 10:04:49 +00:00
Ingo Schommer
32d6342aff MINOR Fixed merge errors 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92845 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:50 +00:00
Sean Harvey
3268f35d29 BUGFIX Fixed "Class not found CMSBatchAction_Unpublish ..." in BatchActionHandler.php, since this class was removed in r90489 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90644 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-02 20:30:55 +00:00
Ingo Schommer
022e3ee2ee BUGFIX Added setup/teardown methods to CMSMainTest to fix test breakages when used alongside cmsworkflow module (which unsets the public batch action) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89864 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 19:57:47 +00:00
Sam Minnee
4b7a3e20fb MINOR: Made security fixture set-up tigher in a test. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89457 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-19 05:26:03 +00:00
Ingo Schommer
3648327b3c BUGFIX More robust URL handling in CMSMainTest to avoid failing on custom /admin redirects 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85513 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-01 06:35:29 +00:00
Sean Harvey
60200f1aa3 MINOR Removed unsetting of GhostPage from CMSMainTest - these are deleted in r77383 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77389 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-20 07:09:54 +00:00
Sean Harvey
b34dcd40b0 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76918 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-15 00:13:11 +00:00
Ingo Schommer
cbddc66547 MINOR Fixed undefined variable in CMSMainTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76877 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 21:56:20 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 06:11:18 +00:00
Sean Harvey
4e4810bbb6 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 22:47:28 +00:00
Sean Harvey
c237366221 MINOR Make use of FunctionalTest with get() and post() methods instead of Director::test() for CMSMainTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75615 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 02:49:43 +00:00
Ingo Schommer
d1e0c9025e BUGFIX Fixed CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() - was comparing a string $class with instanceof() instead of comparing the actually created instance 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74951 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-22 04:23:56 +00:00
Ingo Schommer
c66ebfaeb8 MINOR phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73508 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-22 22:58:18 +00:00
Sam Minnee
f067bd1304 Adding double-quotes to table and field references 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66417 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 22:58:18 +00:00
Ingo Schommer
fa2a2df551 BUGFIX Fixed CMSMainTest to check for translated entities to avoid failing tests with i18n enabled 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65024 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-01 13:42:19 +00:00
Sam Minnee
1034826574 API CHANGE: Added initial CMS tests to the system. These will execute tests on the data model provided by a user's project code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63827 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-08 03:38:32 +00:00
Sam Minnee
221e7b574f Fixed glitch in test 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61628 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-27 08:23:47 +00:00
Ingo Schommer
d5b37fab3d ENHANCEMENT Added default /admin/cms route to cms/_config.php to clear default namespace for other controllers 
BUGFIX Fixed CMSMainTest to use /admin/crm as a standard URL rather than /admin (which could be overloaded by other admins for application-like interfaces without CMS components)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60635 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-13 07:54:34 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets: 
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:59:27 +00:00