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
188827a7b5
BUGFIX: added missing entwine dependency to Security admin
2011-03-01 15:02:38 +13:00
Julian Seidenberg
a394831013
BUGFIX: including entwine dependency in SecurityAdmin
2011-02-24 17:08:38 +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
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
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
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
d5f5e1466e
MINOR Removed jquery.livequery as a Requirement from LeftAndMain.php, its only necessary in SecurityAdmin for MemberImportForm.js now.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:36 +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
Ingo Schommer
1d259855c3
MINOR Fixed regression from r101752 (adding permission roles button was missing)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102010 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:25 +13:00
Ingo Schommer
97a0abb2cc
MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
e507f9488b
BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions ( fixes #5258 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:21 +13:00
Ingo Schommer
bc0934ae10
MINOR Moved PermissionCheckboxSetField specific javascript logic from MemberTableField.js to new sapphire/javascript/PermissionCheckboxSetField.js file
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
5e42eee71a
MINOR Improved help texts around permissions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:09 +13:00
Ingo Schommer
13ee9391bf
ENHANCEMENT Better editing of roles through SecurityAdmin instead of a new "Roles" tab. Removed (previously unreleased) PermissionRoleAdmin. (see #4757 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:08 +13:00
Tom Rix
29c857d34c
MINOR add extendability to SecurityAdmin
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +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
Ingo Schommer
905da3febf
ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm (merged and rewritten from r98750)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
acece9ed3a
ENHANCEMENT Allow extension of LeftAndMain->getEditForm() (and subclasses) through a new updateEditForm() hook (see r98736 for additions to AssetAdmin and CMSMain)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
a7c0797a9d
FEATURE Import groups from CSV in admin/security through the new GroupImportForm class (and GroupCsvBulkLoader) (merged and rewritten from r98711)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
c38a898de3
ENHANCEMENT Allowing custom 'root forms' when id values '0' or 'root' are passed from the tree selection. (rewritten from r98710)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +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
Tom Rix
80b35d15f2
MINOR fix permissions
...
FEATURE add 'view site tree as' functionality.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sam Minnee
ad92b80737
ENHANCEMENT: Update the checkboxes available to batch-actions to show only the applicable pages for that particular action.
...
API CHANGE: Allow for an applicablePages($idArray) method to be defined on a CMSBatchAction class. (from r94761)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
291de8d283
BUGFIX: Ignore elements without a name in change detection.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:12 +13:00
Sam Minnee
25ac72ee22
MINOR create the ability to have some roles only be able to be applied by admins (from r88090)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:12 +13:00
Normann Lou
6ce7428bdc
BUGFIX: if SecurityAdmin::add_hidden_permission() is called more than once, the later one is never added due two array operator "+"
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Will Rossiter
8eddb47344
API CHANGE: removed Director::Link(). Use Controller::join_links() instead
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Ingo Schommer
ce3365d095
MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Ingo Schommer
b261d3cadc
ENHANCEMENT Allowing to hide certain permission from showing in SecurityAdmin? through add_hidden_permission() (refactored from r92428) (from r92866)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Normann Lou
73681b0afa
APICHANGE: add the ability to remove some permissions specified by their code in the rendered field html of PermissionChecksetBoxField and full-covered unit tests of this ability.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Sam Minnee
ad5a8e0fce
BUGFIX Don't suggest members in SecurityAdmin->autocomplete() that the current user doesn't have rights to edit ( fixes #5651 ) (from r110858)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112796 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:02:41 +00:00
Sam Minnee
a12b3f037f
BUGFIX #5852 Missing translation for SecurityAdmin save button causes it to have no text, should default to english "Save" (from r108407)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:00:54 +00:00
Sam Minnee
5b15f9e9e9
MINOR Improved help texts around permissions (from r100783)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:12:59 +00:00
Sam Minnee
dea5cdd64e
MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields (from r101752)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:10:22 +00:00
Sam Minnee
261b4b9a6c
BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions ( fixes #5258 ) (from r101719)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:09:10 +00:00
Sam Minnee
f8f18f40aa
Several merges from branches/2.4
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:04:21 +00:00
Sam Minnee
2010923fe2
MINOR add extendability to SecurityAdmin (from r100360)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:00 +00:00
Ingo Schommer
7e0daa8990
ENHANCEMENT Allow extension of LeftAndMain->getEditForm() (and subclasses) through a new updateEditForm() hook (see r98736 for additions to AssetAdmin and CMSMain) (from r98737)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 00:18:52 +00:00
Ingo Schommer
168589a59f
MINOR Updated jQuery.concrete references to point to the new "entwine" name
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102697 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 05:55:56 +00:00
Ingo Schommer
ce9d92757e
MINOR Fixed merge error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:49:39 +00:00
Ingo Schommer
6c0caeecf9
MINOR create the ability to have some roles only be able to be applied by admins (from r88090) (from r96784)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:43:40 +00:00
Ingo Schommer
480d5068d1
API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor()
...
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166) (from r96809)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:22:43 +00:00
Ingo Schommer
a9f8d553f4
BUGFIX Falling back to currentPageID() in SecurityAdmin->getEditForm() to allow actions like MemberTableField->export() to pass the group ID as a POST parameter instead
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 03:30:47 +00:00
Ingo Schommer
ca3b8d5792
ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-22 04:36:36 +00:00
Ingo Schommer
555fcd94e3
FEATURE Listing all members regardless of group membership by default in admin/security. Deleting a member from this list will delete it from the database instead of the group relationship
...
API CHANGE Renamed SecurityAdmin->getEditForm() form action HTML identifier from #action_addmember to #Form_EditForm_action_addmember
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 21:55:35 +00:00