Commit Graph

187 Commits

Author SHA1 Message Date
Ingo Schommer
7a50608e24 API CHANGE Splitting off "Behaviour" and "Access" tabs from SiteTree->getCMSFields() into SiteTree->getSettingsFields(). Adjusting functionality to split of SiteTree->getCMSFields() into getSettingsFields(), and new tab paths ("Root.Content" instead of "Root.Content.Main") 2011-04-28 22:48:55 +12:00
ajshort
6462c59f0f API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.
MINOR: Replaced references to decorators with extensions.
2011-04-15 19:37:15 +10:00
Ingo Schommer
446b8bae63 MINOR Fixed SiteTreeTest->testCompareVersions() to work regardless of used HTMLCleaner implementation (was failing if lib_tidy wasn't available) 2011-04-06 22:16:46 +12:00
Ingo Schommer
f547da23a3 MINOR Relative $fixture_file links in cms/tests to facilitate moving files 2011-03-30 20:04:31 +13:00
Ingo Schommer
60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00
Ingo Schommer
aef17ed2e0 MINOR Fixed SiteTreeTest->testCompareVersions() to work with new Diff/HTMLCleaner implementation 2011-03-30 18:20:38 +13:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
f1e1cbe09b MINOR Fixed test fixture paths and @package from 'sapphire' to 'cms' 2011-03-28 09:02:43 +13:00
Ingo Schommer
81881e1379 MINOR Added SitetreeHTMLEditorFieldTest to test HtmlEditorField functionality specific to SiteTree and link tracking 2011-03-28 09:02:42 +13:00
Ingo Schommer
dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
7b038db3be MINOR Moved FileLinkTracking feature into new SiteTreeFileDecorator class in order to move it from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
8c04bafb4e MINOR Added class_exists() check for Translatable, which has moved into a new 'translatable' module 2011-03-28 09:02:41 +13:00
Ingo Schommer
6bd9c56100 Moved ContentControllerSearchExtensionTest and SearchFormTest from sapphire/tests/search into "cms" module 2011-03-28 09:02:20 +13:00
Paul Meyrick
dc6ecbd8e8 Minor Moved SiteTreeTest.yml from sapphire/tests to cms module cms/tests 2011-03-28 09:02:20 +13:00
Paul Meyrick
62de2da9e5 Minor Moved MigrateSiteTreeLinkingTask, RemoveOrphanedPagesTask, UpgradeSiteTreePermissionSchemaTask from /sapphire/tasks/ to cms module /cms/tasks/ 2011-03-28 09:02:20 +13:00
Paul Meyrick
5de4f696f3 Minor Moved ErrorPageTest from sapphire/tests/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
69571d5763 Minor Moved VirtualPageTest from sapphire/tests/model/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
d4af221e0a Minor Moved from RedirectorPageTest, SiteTreeActionsTest, SiteTreeBackLinksTest, SiteTreePermissionsTest, SiteTreeTest, WidgetAreaTest /Sites/cgps/sapphire/tests to cms module cms/tests/ 2011-03-28 09:02:19 +13:00
Paul Meyrick
e280929b29 Minor Moved from /sapphire/tests/control/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
d3c5a309bf Minor Moved ErrorPage, RedirectorPage, SiteConfig, SiteTree, SiteTreeDecorator, VirtualPage from sapphire/core/model/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
9b4f3aaf81 Minor Moved ContentController, ModelAsController, RootURLController, NestedController from sapphire/core/control/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
fd3ae9100f API CHANGE Replaced LeftAndMain->ajaxupdatesort() and LeftAndMain->ajaxupdateparent() with a combined LeftAndMain->savetreenode() (and a changed request parameter signature) 2011-03-22 18:43:37 +13:00
Ingo Schommer
a220d37e3b Revert "MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10)" - causing too many issues in mixed build environments with other projects requiring PHPUnit 3.4
This reverts commit 7d609f24c9.
2011-03-11 16:10:38 +13:00
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +13:00
Sam Minnee
5a23f69f0b Merge remote branch 'origin/master' 2011-02-22 10:23:08 +13:00
Ingo Schommer
7d609f24c9 MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10) 2011-02-21 18:49:47 +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
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
Sean Harvey
602fcaa7b5 MINOR Use Filesystem::removeFolder() in FilesystemPublisherTest::tearDown() instead of specific code to handle this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Sean Harvey
9cd40767f6 MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer
f969eeedc3 MINOR Removing MemberImportFormTest, breaks PHPUnit test run, and doesnt have any assertions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +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
97c1ff1e18 ENHANCEMENT Added PageComment->canView()/canEdit()/canDelete(), and using these permissions in PageCommentInterface. Caution: canCreate() actions are still determined by PageCommentInterface::$comments_require_login/$comments_require_permission
BUGFIX Requiring CMS_ACCESS_CommentAdmin instead of ADMIN permissions in PageCommentInterface and CommentAdmin administrative actions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Luke Hudson
cbc0b0a849 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Luke Hudson
0aba4e6bc1 MINOR: Add README.md describing salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Ingo Schommer
5a7a0128f3 MINOR Fixed CMSMainTest for postgres by not hardcoding fixture IDs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Ingo Schommer
c56a6090ce MINOR Unsetting state in FilesystemPublisherTest (regression from r103745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Saophalkun Ponlu
9c4c3eef2e BUGFIX: static publisher for a site that resides in a subfolder of webroot
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Luke Hudson
b19047a299 ENHNANCEMENT: Move cuke/ to salad/
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Geoff Munn
597b9cd2f0 BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Mateusz Uzdowski
9e0c8dd384 BUGFIX: the decorator was not completely removed, which caused trouble for tests running later in the same batch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Luke Hudson
30e6e91a81 BUGFIX: Fix Salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Luke Hudson
5ba4e2d09c ENHANCEMENT: Updated automatic regression tests (Salad)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
1d50542d6f MINOR: Make Salad accept "login" or "log in"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
a32b6237ed BUGFIX: Update Salad tests to match behaviour
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Sam Minnee
e3dd9c9af3 MINOR: Fixed test that was relying on bug fixed in r101116
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101132 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00