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,507 Commits 29 Branches 403 Tags 28 MiB
a99d7b0b1d
Commit Graph

1363 Commits

Author SHA1 Message Date
Ingo Schommer
a99d7b0b1d API CHANGE Removed CMSBatchAction->getDoingText(), the same information can be visualized via a spinner button without this overhead 2011-03-16 14:19:02 +13:00
Ingo Schommer
495e15be9f MINOR Fixed merge errors 2011-03-16 14:18:59 +13:00
Ingo Schommer
4374bd815a BUGFIX Respecting Member::summaryFields() in SecurityAdmin->autocomplete instead of hardcoding Firstname,Surname,Email. This also allows to include Member::$unique_identifier_field in the autocomplete results 2011-03-08 21:01:51 +13:00
Julian Seidenberg
a3bd51e388 BUGFIX: re-applied commit 1192d5b671 in order to get ReportAdmin to work with entwine Tree, not _left _right javascript. 2011-03-01 18:05:26 +13:00
Julian Seidenberg
a3da342b06 BUGFIX: fixed assess to a protected attribute variable of form causing an error. 2011-03-01 16:00:21 +13:00
Julian Seidenberg
188827a7b5 BUGFIX: added missing entwine dependency to Security admin 2011-03-01 15:02:38 +13:00
Julian Seidenberg
3678df8b0f BUGFIX: added in DoingText method for AssetAdmin_DeleteBatchAction to allow it to be enumerated by CMSBatchActionHandler->batchActionList() 2011-03-01 14:44:35 +13:00
Julian Seidenberg
a394831013 BUGFIX: including entwine dependency in SecurityAdmin 2011-02-24 17:08:38 +13:00
Julian Seidenberg
88f67c5859 ENHANCEMENT: including all of jquery-ui instead of specifying individual pieces of it. This is a larger download size, but should be quicker overall as it is just a single download instead of lots of small files. 2011-02-24 17:07:20 +13:00
Julian Seidenberg
1c5f161384 BUGFIX: added SideReportForm back in as an allowed action, which is called when loading a new page in the CMS. 2011-02-24 17:03:24 +13:00
Julian Seidenberg
dba2ed6c07 BUGFIX: updated links to new jquery ui file paths 2011-02-24 12:12:31 +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
3495fc0b7c BUGFIX Fixing TinyMCE path enumeration which throws off its 'template' plugin by invalid spaces (fixes #6407, thanks drombolaget_fredric) 2011-02-22 00:28:26 +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
3b6a9579d4 BUGFIX #6304 PageCommentInterface::PostCommentForm() loads inappropriate data from cookie, including wrong values for ParentID 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115399 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:53 +13:00
Ingo Schommer
25de6303a8 BUGFIX Allowing CMSMain->rollback() outside of form contexts, temporariliy disabling CSRF protection. Necessary in order to get rollback actions working from admin/getversion (regression from 2.4.4 release, see #6291) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:53 +13:00
Ingo Schommer
6a02f2edb5 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() (from r115185) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 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
7428010748 BUGFIX Added SecurityToken to PageCommentInterface->DeleteAllLink() (fixes #6223, thanks Pigeon) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114195 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:52 +13:00
Sean Harvey
e907e2e266 BUGFIX Fixed case where AssetAdmin would throw an error if $links was not an object in AssetAdmin::getCustomFieldsFor() 
MINOR Defined $backlinks as an array before adding entries to it


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:51 +13:00
Saophalkun Ponlu
75f12d5a7e ENHANCEMENT: Update Asset's left and right panels with filders and files after 'Look for new files' was triggered (open #5543) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113871 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:51 +13:00
Ingo Schommer
b8338bc2bc MINOR Typo in AssetAdmin (fixes #6191, thanks Juanitou) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113695 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:51 +13:00
Ingo Schommer
e8e5c62c5a BUGFIX Avoid reloading CMS form twice after certain saving actions (fixes #5451, thanks muzdowski) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113692 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:51 +13:00
Ingo Schommer
6df2e74323 MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() (fixes #6159) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:50 +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
4bc9a5aee8 MINOR Removed unused SecurityAdmin->MemberForm() and savemember() (see MemberTableField) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113281 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:50 +13:00
Ingo Schommer
b31cb6731e MINOR Removed unused Security->addmember() (see MemberTableField and SecurityAdmin->addtogroup()) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113280 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:50 +13:00
Ingo Schommer
f8fd60f02b MINOR Removed unused SecurityAdmin->removememberfromgroup() (see MemberTableField) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113279 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:49 +13:00
Jean-Fabien Barrios
6c0a41f0c4 Added doc for static help_link 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111879 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Saophalkun Ponlu
ee4e748803 MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Jean-Fabien Barrios
75544392a2 ENHANCEMENT: 6017 - Configurable help link 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111828 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Ingo Schommer
054a6d2270 MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111786 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Will Rossiter
55e245aca8 MINOR: removed debug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111454 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Will Rossiter
a584a1f516 BUGFIX: added validation to the page comment form 
Fixes #2782

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Will Rossiter
6bf7bd1819 MINOR: removed debug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111450 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Will Rossiter
4cc09f2a39 ENHANCEMENT: allow PageCommentForm to store all users data, rather than hardcoding the fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111449 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Will Rossiter
b76b6f61d2 ENHANCEMENT: simple extend hook for PageCommentForms. Temporary measure till #6053 is implemented 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111443 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Ingo Schommer
798c1d173a MINOR Ensuring SiteTreeAccess.js is properly minified in live mode 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111224 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Ingo Schommer
01373cf4af BUGFIX Disallow addition of members to groups with MemberTableField->addtogroup() when the editing member doesn't have permissions on the added member 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110859 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Ingo Schommer
51fee3fe45 BUGFIX Don't suggest members in SecurityAdmin->autocomplete() that the current user doesn't have rights to edit (fixes #5651) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Sean Harvey
c134b8e020 BUGFIX #5811 Fixed default selection of root node when CMS first opened (no currentPage set in session) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110439 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Julian Seidenberg
31a9271c85 BUGFIX: CSVBulkLoader import method now no longer requires files to end in '.csv'. Some projects want to import files in CSV format, but not of csv file type. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108887 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:46 +13:00
Sean Harvey
2e25aa2bdf BUGFIX #5852 Missing translation for SecurityAdmin save button causes it to have no text, should default to english "Save" 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108407 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Ingo Schommer
473347dcfe BUGFIX Fixing default group selection in 'add member' dialog (in MemberTableField) (fixes #5836) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108099 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Ingo Schommer
dd70fcd5be BUGFIX AssetAdmin->doUpload() shows JS alert *before* triggering a page reload, as this seems to mess up TinyMCE in Firefox on subsequent page loads (fixes #5838) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108096 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Ingo Schommer
3ef552d539 MINOR Disabled 'showcalendar' option on CMSMain->SiteTreeFilterDateField() - it causes the CMS to load jQuery UI javascript just for this (rarely used field). To be re-enabled once we work with jQuery UI on a broader scale. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107784 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:44 +13:00
Ingo Schommer
8c43535225 MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107726 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:44 +13:00
Ingo Schommer
b505c5540a MINOR Removed debug code in MemberTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107525 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:44 +13:00