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

161 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
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
Sam Minnee
9ac87ea4fc 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@101117 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:17 +13:00
Geoff Munn
16f4e99af9 BUG FIX: column names quoted properly 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100699 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:07 +13:00
Geoff Munn
c3006cc448 BUG FIX: column name capitalised 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100689 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:07 +13:00
Sam Minnee
6b1f258c44 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99789 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:05 +13:00
Ingo Schommer
033d27ac3f MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854) (merged from r98855) (from r98865) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99686 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:00 +13:00
Carlos Barberis
9624757e14 ENHANCEMENT: added new PageCommnet to yml so we have different amounts of moderated/unmodereated 
BUGFIX: really testing deletemarked now.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99679 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:59 +13:00
Ingo Schommer
0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation. 
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:58 +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
641a8fec7a MINOR Fixed FilesystemPublisherTest to have self-contained extension settings, and not rely on static publishing being enable in mysite/_config.php already. Fixed login permissions for doPublish() calls in test case. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99347 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:55 +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
Carlos Barberis
554ea629dc ENHANCEMENT: added PageComment for CommentAdminTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99069 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:45 +13:00
Carlos Barberis
a0c8e9e1eb ENHANCEMENT: CommentAdmin unitest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99066 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:45 +13:00
Tom Rix
f72fb26b4c BUGFIX fix for #5076 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:44 +13:00
Ingo Schommer
a9d6dec5ec FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class (merged from r98708) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98732 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:42 +13:00
Sam Minnee
983849449e API CHANGE: Introduced new API for SS_Report 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98215 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:39 +13:00
Sam Minnee
602e5ae671 MINOR: Fixed side report tests to suit new report system. (from r96646) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98198 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:37 +13:00
Sam Minnee
4982aac955 MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98192 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:36 +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
Will Rossiter
463053136d BUGFIX: Comment URL field check is now case insenstive. Included tests for various protocols. PATCH via simon_w. Ticket #4776 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97016 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:21 +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
4567f66a0a MINOR: Updated ModelAdminTest to use extraDataObjects (from r90055) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96803 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:15 +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
Sam Minnee
460fe2e5ab MINOR: fix javscript syntax that can confuse ie (from r86395) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96776 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:11 +13:00
Mateusz Uzdowski
b89cb9b018 BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95788 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:09 +13:00