Commit Graph

1661 Commits

Author SHA1 Message Date
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
Sean Harvey
255aa5d0f5 ENHANCEMENT #5352 CMS now uses the user's preferred date and time formatting in DateField and TimeField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Sean Harvey
e6aeb94217 MINOR Reverted r107305
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Sean Harvey
87341f9498 MINOR Code formatting fix for setting Member locale in LeftAndMain::init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107305 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Luke Hudson
0fe83d2264 BUGFIX: re-enable broken link notification using BackLinkTracking() (this was broken since r101127
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Luke Hudson
2845529234 BUGFIX: Apply AJShort's patch to fix SiteConfig (trac 5671)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Saophalkun Ponlu
3877eae035 ENHANCEMENT: Prevent image search queries all images in the site initially when the page is loaded
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Saophalkun Ponlu
53646b3187 BUGFIX: fix query error when image search doesn't use legacy search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Luke Hudson
b20a69dd04 MINOR: Add comments for ThumbnailStripField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Luke Hudson
af428a9bf2 FEATURE: Enable switch between legacy image search and new version
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Sam Minnee
8b82347453 BUGFIX: Fixed caching of homepage.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Ingo Schommer
6d74db77ff BUGFIX Setting 'ID' field on CMSMain->RootForm() so it can work with formfields that require it (fixes #5671, thanks ajshort)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Andreas Piening
47ac736d50 MINOR: add text/plain to the list of accepted mime types
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter
58a92cf456 BUGFIX: fixed select all link using incorrect function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Carlos Barberis
6efa5a8554 BUGFIX: validate file in import from CSV form
MINOR: Clear DB checkbox unchecked by default
ENHANCEMENT: Ability to hide form by className or for the whole ModelAdmin


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter
18f402968a BUGFIX: if moderation on comments is enabled then redirect the user back down to the comment section to view the message rather than trying to direct to selector which doesnt exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer
c7fc13c9fe MINOR Using ASSETS_DIR constant in StaticPublisher (fixes #5619)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer
383358fa05 MINOR Translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer
166d6f421f ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer
694a47f245 MINOR missing slash / from Requirements::css() parameter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer
4182cd4709 ENHANCEMENT Showing 20 comments in tabular view for CommentAdmin (and making the setting configurable via CommentAdmin::set_comments_per_page())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:37 +13:00
Ingo Schommer
5d5cc70a69 ENHANCEMENT Abbreviating comment text display in CommentAdmin to first 150 characters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:37 +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
fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +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
Sam Minnee
24b83db9c2 BUGFIX: Prevent DataDifferencer from creating empty <ins /> and <del /> takes that confuse the browser.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104675 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Sam Minnee
e0b5c8f39f ENHANCMENT: RsyncMultiHostPublisher also rsyncs sapphire/static-main.php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Sam Minnee
bafeaaea1c API CHANGE: Added RsyncMultiHostPublisher::set_excluded_folders().
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104673 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Sam Minnee
5fd8e78f31 BUGFIX: Make RsyncMultiHostPublisher protected; give default value.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Ingo Schommer
6c12757a91 MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Ingo Schommer
aeacbafe16 BUGFIX Fixed publication of homepage with '/' URL through StaticPublisher (fixes #5514, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Ingo Schommer
1b5b140429 BUGFIX Fixed SS_Report::unregister() parameter naming (fixes #5511, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +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
19b2718519 BUGFIX: Use correct quoting for BrokenLinksReport (ticket #5474)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:30 +13:00
Saophalkun Ponlu
07d182a19a MINOR: sort page comment table by Created field - show newest entries first
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:30 +13:00
Saophalkun Ponlu
5b6bec63aa MINOR: added moderation message for non-ajax mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Luke Hudson
3ab7de6051 MINOR: Fix to ModelAdmin, part of r103519
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Normann Lou
5cbb94b43b MINOR: add more in-line documentation and fix the typo: should => should not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Luke Hudson
d36bc64f31 BUGFIX: Prevent duplicate HTML IDs in ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Ingo Schommer
53f53bd27f BUGFIX Fixed redirection in PageCommentInterface to use Link() instead of URLSegment (fixes 4200, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Normann Lou
f19c5200d1 ENHANCEMENT: to make the FileIFrameField and TreeSelectionField easy to use in CMS with Translatable on.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +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
6330e4ec4b MINOR Fixed phpdoc documentation (from r103384)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Ingo Schommer
a6db618c12 BUGFIX Using try/catch in MemberTableField->saveComplexTableField() similiar to parent implementation, which means trying to save a Member duplicate doesn't end up in a fatal error (fixes #5444)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103336 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
Geoff Munn
051143465e BUGFIX: realtime publishing now enabled by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Mateusz Uzdowski
0ba1e35ece BUGFIX: make the javascript-producing functions behave in the same way. Now they will return a javascript snippet and the caller is responsible for adding it to a FormResponse. Removes the duplication in AJAX response which happened when FormResponse::add has been used before the call to JS helper functions (#5359)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Saophalkun Ponlu
4ee4878dc1 BUGFIX: correct mollom field mapping
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Carlos Barberis
219e55ef55 MINOR: reverted wrong change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Carlos Barberis
ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Ingo Schommer
5e9d3a3f38 BUGFIX Fixed CTF sorting in ModelAdmin results (was failing because of missing 'ResultAssembly' GET parameters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Will Rossiter
b7a9287844 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Sean Harvey
963fd45c91 BUGFIX #5255 LeftAndMain should include the correct editor.css file so typography from user selected theme in SiteConfig is shown in TinyMCE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:25 +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
f5be047b97 BUGFIX Stop IE6/IE7 from redirecting in admin/assets after deleting multiple folders (fixes #5208)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Will Rossiter
1a3a8d0a0c MINOR: removed duplication of variable and conditional that would never pass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Sam Minnee
b6a41ebc19 BUGFIX #5295: Update CMS site name in LHS via Ajax after siteconfig save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Andreas Piening
b9b4acabaf BUGFIX: keep ModelAdmin from importing data twice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +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
Sean Harvey
4469b0028a BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101737 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
Mateusz Uzdowski
fb16cc63f6 BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:19 +13:00
Sam Minnee
11392e5bb2 BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer
5271e54972 MINOR Fixed wrong default value for AssetAdmin (see r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Sam Minnee
fd42eae95b MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
3e9424ac27 MINOR Fixed permission language code regression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
3ed6e4df05 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
6378a0fece MINOR Using jquery.live and behaviour.js instead of livequery in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
2b99e45627 BUGFIX: Fixed notice level error with folder ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
b033c1839c BUGFIX: fixed file uploading not uploading any files at all
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +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
3cb46c28b5 MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100789 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
2128b4cf1e BUGFIX reload page if broken link tracking values changed during a save. Ticket #1363
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
abe4049c3d BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) (from r100720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
9466e07335 BUGFIX Fixed MemberTableField->addtogroup() to fetch existing Member records by ID or $unique_identifier_field instead of relying on the (now removed) "auto-merging" in Member->onBeforeWrite() (see r100705) (from r100716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Mateusz Uzdowski
3f6a4dedfd BUGFIX: moving the ajaxupdatesort JS response code from php to js to get rid of eval. Also disable the "loading" on the moved element when we are done, in case we are repositioning other than the selected item - otherwise the progress indicator is displayed indefinitely.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
ff236fe98d BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Sean Harvey
2a9be51b90 MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
79ce73c757 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Mateusz Uzdowski
98cec468b2 BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
56a32fe5c6 MINOR Reverted r100484 as it was causing too many problems
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
df46043a67 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
bed912822c BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +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
Sean Harvey
b810f0ecbc BUGFIX #5023 AssetAdmin::sync() is now used to sync tasks, as it works when the user only has access to the AssetAdmin controller instead of going to dev/tasks/FilesystemSyncTask which can only be run by administrators or if the site is in dev mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Will Rossiter
681eff9eda ENHANCEMENT: allow ordering of page commented to be configurabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Sean Harvey
4dd3740682 ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Ingo Schommer
55520f1523 BUGFIX Setting default $groups in MemberTableField::AddForm() in addition to MemberTableField_Popup::__construct() - this was broken by r99777
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Luke Hudson
8fe62100c6 BUGFIX: Use underscores in names of combined .js (#3581)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +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
Tom Rix
a11effb33a BUGFIX make siteconfig work again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:04 +13:00
Ingo Schommer
a0c69ad63f MINOR Fixed MemberTableField regression from r99706 (from r99710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:03 +13:00
Ingo Schommer
f088acf5e3 BUGFIX Fixed MemberTableField limiting of , wasnt taking children groups into account (regression from r99684) (from r99706)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99713 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
9a5b429ad1 BUGFIX Setting ID explicitly in MemberTableField-> to ensure getCsvQuery() correctly filters (the custom group filter was only implemented in sourceItems() before) (from r99684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
f47e12f726 ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values (from r99579)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
7f3c14784f MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion (from r98883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
8c67b1a01e ENHANCEMENT Saving MemberTableField through new 'Groups' field added in Member->getCMSFields(). (from r98882)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +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
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
Tom Rix
5b36ce5cc0 BUGFIX use the correct method for retrieving the report ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Tom Rix
4539825a1b MINOR add pass thru group and sort methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Luke Hudson
1091dafdf0 BUGFIX: Correct StaticPublisher filenames, now works with nested URLS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Ingo Schommer
12761de90b MINOR Using DateField in CMSMain->SiteTreeFilterDateField(), as CalendarDateField is now deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:56 +13:00
Ingo Schommer
d61a370972 MINOR Moved timezone coupling in SS_Report labels into timezoneawareness module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
e65429d6a6 MINOR Localized reports
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
c941ca899a MINOR Fixed merge error (see r99114)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
b41c401223 BUGFIX: Fix not being able to print/export reports (from r98684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
aea14859f9 MINOR: Bugfix in previous commit (from r98660)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
61fac5b804 BUGFIX: Fixed cache prepopulation on sitetree load. (from r98651)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:53 +13:00
Ingo Schommer
a57e18bbb6 BUGFIX: Make sure navigation links update when urlsegment is changed (from r98649)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:53 +13:00
Ingo Schommer
7e6ae12b4c MINOR don't remember what report you had selected in ReportAdmin (from r98560)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:52 +13:00
Ingo Schommer
7ea8f1c7f4 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:51 +13:00
Ingo Schommer
82f95ae415 MINOR fixed two reports with links that did not open in new windows (from r97816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
8302f97ffc FEATURE set file metadata on upload. (from r97780)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
bf2924e159 BUGFIX: Fix navigator links not opening in new windows. (from r97510)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
70f4894857 BUGFIX: Fixed bug in r97395 (from r97508)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Ingo Schommer
2462a9cde9 MINOR add the ability to link-check the live table too (from r89473) (from r95310)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Ingo Schommer
032ce7f60b MINOR pingStatus ping frequency reduced
MINOR updated lang file for SiteConfig
MINOR improved documentation in StaticPublisher
MINOR improved documentation in CMSMain surrounding reports and siteconfig
MINOR migrated headers in SiteConfig to i18n'd (from r86429)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Ingo Schommer
3377198bc4 MINOR Added Requirements for SilverStripeNavigator (see r99080)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Tom Rix
801161369e MINOR make static caching smarter around cacheSubdirs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:46 +13:00
Carlos Barberis
c9b2355efe BUGFIX: fixed query to get number of unmoderated comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +13:00
Tom Rix
3c3b8b40de MINOR disable real-time static publishing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +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
Geoff Munn
a08c77c360 BUGFIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Sean Harvey
16e1941203 MINOR Removed double brackets from Diff::cleanHTML()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Luke Hudson
4192dcdf07 MINOR: Fix documentation for Diff::cleanHTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:41 +13:00
Luke Hudson
166b5fb95b FEATURE: Add HTMLCleaner abstract class, and Diff::cleanHTML()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:41 +13:00
Sean Harvey
d5b2d40123 MINOR Removed argument to getDescendantIDList() in ThumbnailStripField that doesn't exist on the method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Sean Harvey
b2d2220d22 MINOR Removed arguments to Hierarchy::getDescendantIDList() calls, as the method does not have any
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Ingo Schommer
dc15573458 MINOR Fixed SS_HTTPResponse references in CMSBatchActionHandler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Ingo Schommer
8a3ac76d0b MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Sam Minnee
5c0df5d691 MINOR: Only clear theme in CMS if we're not redirecting to the login form (better for testing).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
a17feb75fa BUGFIX: Fixed side report seelctor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
2ff2d28841 BUGFIX: More fixes renaming SSReport to SS_Report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +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
ba0adbc48d ENHANCEMENT batchactions can now implement confirmationDialog() to provide a custom confirmation dialog to the front end.
MINOR added above confiration to batch setting expiry (from r97215)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
f9769c5b0a MINOR set Print flag correctly on TLF
MINOR custom print template for SSReport TLF's that exposes the report title, and filters set (from r97138)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
7068326350 MINOR fix dropdown labels (from r97063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
faa812e45b BUGFIX: Better broken reason sorting (from r96989)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
21a9fec0ba BUGFIX: Allow changing direction in broken link type (from r96987)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
93ae487e55 BUGFIX: Fix broken reasons sorting (from r96985)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
f9d6dc1269 BUGFIX: Improvements to sorting of columns on broken links report (from r96979)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98202 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
0b20bd4e51 MINOR: Change page title heading to "Page name" for consistency in CSV export (from r96925)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
f288815ab4 MINOR using better sorting api (from r96483)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
7bc486a512 MINOR fix sorting in this report. (from r96481)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
8ab939ca16 MINOR make site checking clearer on broken links report (from r96456)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
1215f6f1f5 MINOR typo fixes, adding missing columns (from r96433)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
63580a4b13 API CHANGE: Added SideReportWrapper to help you tailor report columns for the side reports.
API CHANGE: Allow use of 'casting' option on side report columns.
API CHANGE: Make 'title' optional on side report columns. (from r96272)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
5e8fc6c920 MINOR improved wording on reports (from r96258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
dee3b20ccd MINOR added broken links report (from r96139)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
a78dee1362 BUGFIX: Removed unnecessary '?' from report URLs when there are no search criteria (from r96052)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:35 +13:00
Sam Minnee
cc89bc68e9 BUGFIX: Don't throw an error if there are no report filters.
ENHANCEMENT: Allow for custom generation of SSReport::ID() for parameterised reports.
MINOR: Added SSReport::dataClass() accessor.
BUGFIX: Don't randomise the order of reports with the same priority. (from r95955)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:34 +13:00
Sam Minnee
b50917db00 BUGFIX: Only list reports in admin/reports that you can actually view (from r95885)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
a5753ad5ef API CHANGE: Removed SideReport class, use SSReport as the base-class for them instead.
API CHANGE: Use SSReport::register(SideReport) to explicitly register reports on the LHS of the content view.
BUGFIX: Updated all cms side reports to use SSReport as the base class. (from r95884)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
1b32326b9e API CHANGE: Added explicit registration of reports with SSReport::register() (from r95857)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
0782c0de4d ENHANCEMENT: Improved look and feel for report filtering
ENHANCEMNT: Added export and print buttons to reports (from r95815)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
c05cdf8dc1 Nicer dates (from r95776)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
104171087b MINOR: Nicer date formatting (from r95761)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
ec43205551 BUGFIX: Fixed bug with report search fields not showing the value that you just searched for. (from r95567)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
61a0240a54 BUGFIX: Fixed report pagination, with or without search params (from r95555)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
5fdc153a19 ENHANCEMENT: Performance improvement to CMS load time with many pages. (from r95490)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
9563c650b4 MINOR updated detection for an empty report (from r87362)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
7a1e8591c8 MINOR when you delete a user from a group, they are also removed from any sub groups. (from r87119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98158 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sam Minnee
fd38303749 MINOR applied correct decorators
MINOR Page.ss now takes advantage of the SiteConfig
FEATURE audit trails
MINOR fixed JS error around concurrent editing
MINOR ability to disable sorting on tablelistfield
MINOR added default timezone to static-main.php to avoid PHP warnings
MINOR only display Roles tab on groups if there are roles in the system
MINOR publishing activity report
ENHANCEMENT ability to parameterize SSReport's (from r85903)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +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
Sean Harvey
f3d0a4f54a BUGFIX Fixed incorrect logic in CMSMain::generateTreeStylingJS() stopping different tree icons from working
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98018 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +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
3a61db6221 BUGFIX: Don't let a user's theme break the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Will Rossiter
39772cfcc4 ENHANCEMENT: Select the uploaded image after uploading by default. #4962
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Sam Minnee
51cb7f35f3 BUGFIX: Don't rely on the current directory for any logic.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Andreas Piening
5f4a432619 MINOR: #4674 applied patch for special chars in folder titles
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Will Rossiter
4a90c3e96f BUGFIX: Fixed bug when user selects no folder and uses the search box it incorrectly doesnt append the where statements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Will Rossiter
5a071b4ef6 ENHANCEMENT: CMS Editor Upload panel now loads the root files directly and allows the user to upload to the root assets dir
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Ingo Schommer
16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Sean Harvey
d5d148c0d5 MINOR Removed end php tag from WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97532 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:26 +13:00
Sean Harvey
ed4204b7fa BUGFIX Fixed incorrect lables "TOADD" etc in WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Will Rossiter
a19fea2416 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Ingo Schommer
0b0f2b8d93 MINOR Backwards compat fix for sprintf() call in CMSMain->providePermissions() (#4764)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:23 +13:00
Ingo Schommer
07727e60bc BUGFIX Setting 'Locale' as HiddenField in CMSMain->getEditForm() to support translatable SiteConfig records (see r97370, #4770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97472 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Andrew Short
fcbce693b7 BUGFIX: Properly closed a tag in AssetTableField that was hiding content after the back link tracking tab.
From: Andrew Short <andrewjshort@gmail.com> (from r95036)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Mateusz Uzdowski
e4726af363 BUGFIX: removing hardcoded reference to ModelAdmin_RecordController, also added getters for model controllers.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Ingo Schommer
cda3d5ae2a MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sam Minnee
d40afc9cdc BUGFIX: Fixed redirection destionation of the modeladmin delete button on the detail form.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Ingo Schommer
cd63f3f872 MINOR Removed 'print' button from CMSMain->getEditForm() for display of older versions (see #4745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Mateusz Uzdowski
48171d1f58 BUGFIX: now hiding the permissions via SecurityAdmin::add_hidden_permission works also for PermissionRoleAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Mateusz Uzdowski
8cbffb199a BUGFIX: HTTPResponse has been replaced with SS_HTTPResponse
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +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
Sean Harvey
cb541e6333 BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
51ad525b69 BUGFIX: reintroduced 96961, build failed for other reason.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
ed388aef11 REVERTED: 96961 fails the test, reverted.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96966 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
e81b978ecf BUGFIX: loading a subtree was failing - couldn't call getSiteTreeFor reliably on LeftAndMain which is abstract class in its nature. Now using valid subclass instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Sam Minnee
ec990131dc BUGFIX: Fixed a PHP segfault bug with the WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
79968d0814 API CHANGE: Added capability for batch actions to indicate failure through red checkboxes (from r94868)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
27907e4ced API CHANGE: Added canView() to CMSBatchAction so that you could hide certain batch actions from some users. (from r94846)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
c124dd23fa BUGFIX: Removed XSS holes (from r94822)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
ee2490fe68 API CHANGE: Added applicablePagesHelper to CMSBatchAction to ease the process of creating new applicable page methods.
ENHANCEMENT: Added applicable pages checks to delete from live, delete from draft, and publish (from r94775)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +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
7c6623373b BUGFIX: Don't show obsolete page if you refresh the CMS after deleting a page (from r94242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
bef0f2f290 BUGFIX: Use canDeleteFromLive instead of canPublish for checking delete from live action (from r93316)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
d674e2b032 MINOR moved allowed_extensions and friends to the model layer (from r92046)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
37dcb0d970 MINOR moved File validation to the model (from r92044)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
713f595138 MINOR implement the allowedExtensions functionality of AssetAdmin when you rename a file (from r92037)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
d85d2bd1c9 MINOR: Made delete from draft batch action text more consistent with published. (from r91839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
a3306e8834 BUGFIX: Correct labels for "delete from draft" batch actions (from r91838)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
86b08f44a4 BUGFIX: Use doDeleteFromLive when deleting pages from live, so that onBeforeUnpublish and onAfterUnpublish are called. (from r91381)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
adfab8b55f API CHANGE: Added FilesystemPublisher::getExistingStaticCacheFiles(), to help build caching logic methods. (from r91354)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
0cdd75dfb1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor()
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
80756cc498 MINOR add a hidden field to attach the subsite ID, rather than relying on the session (from r91014)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
df0bc2ff73 MINOR: Fixed notice-level error in rollback. (from r90260)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96804 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
4ba5e78b28 MINOR: Removed debugging statements (from r90052)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
aacde1063d MINOR: Fixed testing quirk of static publisher unpublishing. (from r90048)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
0ee53df7a6 ENHANCEMENT: Let LeftAndMain subclass canView() methods optionally redirect. (from r90018)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:14 +13:00
Sam Minnee
58534f76c5 BUGFIX: Updated onAfterUnpublish to republish page from static cache as well as unpublish them. (from r90002)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:14 +13:00
Sam Minnee
b561550c69 BUGFIX: Removed destroy() calls from static cache builder; with the garbage collection improvements it shouldn't be necessary. (from r89983)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:14 +13:00
Sam Minnee
a695b6b034 BUGFIX: Don't set the Owner by default on new records. (from r89910)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96796 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +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
c841b11edd ENHANCEMENT: Added new onRenameLinkAsset() handler to static publishing for better link rewriting. (from r89014)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Sam Minnee
2cf10e76fe MINOR added batch deletion back for workflow (from r88916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:12 +13:00
Sam Minnee
568f808053 MINOR rename deleted pages report (from r88333)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:12 +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
Sam Minnee
141886d675 MINOR remove default form actions. Unit tests pass. (from r88065)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Sam Minnee
096bfb2565 BUGFIX: Fix image tracking not working cross subsite (from r88008)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Sam Minnee
7af4414a02 BUGFIX: Fix changing the URLSegment on a page making the Draft Site link
point to the wrong subsite (from r87776)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Sam Minnee
00264e219c BUGFIX: Fix highlighting of incorrect page when loading a page in the
admin section via URL (from r87320)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Sean Harvey
2e762da45e MINOR Moved defined variables in AssetAdmin::doUpload() to the top of the method for consistency
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96230 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +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
Will Rossiter
19670e7b27 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Will Rossiter
a578804987 ENHANCEMENT: added translatable support to mathspamprotection. PATCH via noini (#4755)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Tom Rix
2d3365f7b2 MINOR make widgetarea/editor more suitable for generic use
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Tom Rix
ee49d36dd7 MINOR remove relic of concurrent editing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95070 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Will Rossiter
7d48f2c1c8 BUGFIX: fixed spam not being turned into ham if spamprotection isnt enabled. PATCH via simon_w #4813
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Will Rossiter
0e65de67f8 BUGFIX: check akismet is enabled before saving spam. PATCH via simon_w - #4812
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Sam Minnee
f17dd0c37e BUGFIX: Fix default inclusion of (theme|project)/css/editor.css into the WYSWIWYG editor.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94350 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +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
Sean Harvey
4e9d2c3663 BUGFIX Removed code that relied on deprecated functions in MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Will Rossiter
a12f9c987f API CHANGE: removed deprecated LeftAndMain::add_menu_item. Use CMSMenu::add_menu_item()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Will Rossiter
49b720ffd0 API CHANGE: removed deprecated extend calls (r93632). API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag() (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render on CTF (r93679).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Sean Harvey
5a1a947b92 MINOR Removed ContentNegotiator::disable() since it's disabled by default (in AssetAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93681 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Sean Harvey
84a591bf2b BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Sean Harvey
0dfa69146d MINOR Removed MemberTableField deprecated methods for adding fields - this should be done by implementing summary fields on a Member decorator instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93662 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
Sean Harvey
9433580f95 MINOR Removed MemberTableField::setController() - this is now redundant from r92134
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Tom Rix
a3a70c85eb BUGFIX FolderID was not present in post, so file would not be uploaded to the correct place.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Tom Rix
5c8628e7d4 MINOR added stubs to allow widgets to use treedropdown fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
d59b2ad5cf BUGFIX: fixed order inclusion of js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
dcd6c53ca5 MINOR: fixed typo with path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
a9427422c0 FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Sean Harvey
3e7990d941 BUGFIX Fixed PageComment boolean operators in WHERE SQL clauses that break MSSQL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
d6a2e66c89 MINOR removed concurrent editing (merged from r91198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Sean Harvey
9b49ebf8b4 BUGFIX Fixed pages not being manipulated properly in the CMS because of a PHP error in CMSBatchAction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90936 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
27521df744 MINOR Changed silverstripe.com references to silverstripe.org
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
1e0579cbe4 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 00:00:49 +00:00
Ingo Schommer
102ba8b424 BUGFIX Fixed ModelAdmin->getResultsTable() to only apply summary field formatting if at least one field exists, to avoid array_fill() errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 00:00:48 +00:00
Will Rossiter
95e6516e61 BUGFIX: disable translatable filter on batch actions. Fixes #4442 (thanks to helgert)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-17 01:01:12 +00:00
Ingo Schommer
2d3bb7de3e MINOR Making controller/response optional in CMSBatchAction->batchaction() in order to make the class more testable in isolation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 08:33:06 +00:00
Saophalkun Ponlu
d97cfcbc7f ENHANCEMENT: Improve CMS loading screen #6254
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 04:08:02 +00:00
Ingo Schommer
28ee63fed1 MINOR Partially reverted debug comments from r115109
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 02:38:27 +00:00
Ingo Schommer
4d127c5976 BUGFIX Passing current request on to LeftAndMain singletons in CMSMenu::get_viewable_menu_items() to avoid state errors (e.g. when decorators check request data, see "subsites" module)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 02:37:40 +00: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
Will Rossiter
6d0c79c839 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 05:43:08 +00:00
Jean-Fabien Barrios
9f2d488758 BUGFIX File upload not working when open_basedir is set #5547
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-03 00:28:30 +00:00
Ingo Schommer
b4ff8e7bd0 MINOR LeftAndMain->LogoStyle() doesn't output empty background CSS if no logo is set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:04 +00:00
Ingo Schommer
65b3b145f1 ENHANCEMENT Setting $this->request in ModelAdmin_RecordController->edit() instead of returning new response, so it can be altered by subclasses
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:03 +00:00
Ingo Schommer
c579822340 BUGFIX Don't re-add actions in ModelAdmin->EditForm if they're already present from DataObject->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:03 +00:00
Ingo Schommer
db6432389b MINOR Reverted merge error from r111600 (windowName() method is no longer availabie)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-13 02:47:31 +00:00
Geoff Munn
715f864d3d MINOR: Column names escaped properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-01 02:59:33 +00:00
Sam Minnee
83561f2e40 Added doc for static help_link (from r111879)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:20 +00:00
Sam Minnee
6bab1cfa0a MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian (from r111875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:15 +00:00
Sam Minnee
1e6da51ad4 ENHANCEMENT: 6017 - Configurable help link (from r111828)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:10 +00:00
Sam Minnee
f491f17bc0 MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas) (from r111786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112806 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:05 +00:00
Sam Minnee
81d4abf9d3 MINOR: removed debug (from r111454)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112804 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:53 +00:00
Sam Minnee
f124be7f95 BUGFIX: added validation to the page comment form
Fixes #2782 (from r111452)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:49 +00:00
Sam Minnee
2ae76958bb MINOR: removed debug (from r111450)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:44 +00:00
Sam Minnee
fe9303f277 ENHANCEMENT: allow PageCommentForm to store all users data, rather than hardcoding the fields (from r111449)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:38 +00:00
Sam Minnee
5a0420b8e1 ENHANCEMENT: simple extend hook for PageCommentForms. Temporary measure till #6053 is implemented (from r111443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:31 +00:00
Sam Minnee
185e30a750 BUGFIX Disallow addition of members to groups with MemberTableField->addtogroup() when the editing member doesn't have permissions on the added member (from r110859)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:02:47 +00: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
b3f510eef1 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. (from r108887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:02:06 +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
00ff9c4daf BUGFIX Fixing default group selection in 'add member' dialog (in MemberTableField) (fixes #5836) (from r108099)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:00:14 +00:00
Ingo Schommer
d236cbd03e 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. (from r107784)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:58:10 +00:00
Ingo Schommer
78489ad4fc MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc (from r107726)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:57:11 +00:00
Ingo Schommer
d402ca527a MINOR Removed debug code in MemberTableField (from r107525)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:57:05 +00:00
Ingo Schommer
ed67b2dc42 ENHANCEMENT #5352 CMS now uses the user's preferred date and time formatting in DateField and TimeField (from r107327)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:42:06 +00:00
Ingo Schommer
9877ff6ebd MINOR Reverted r107305 (from r107307)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:41:58 +00:00
Ingo Schommer
2098bae2fd MINOR Code formatting fix for setting Member locale in LeftAndMain::init() (from r107305)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:41:51 +00:00
Ingo Schommer
1a80b91301 BUGFIX: re-enable broken link notification using BackLinkTracking() (this was broken since r101127 (from r106360)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:40:11 +00:00
Ingo Schommer
1cc5c5ee8e MINOR Fixed merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:31:48 +00:00
Ingo Schommer
6f41e77e51 ENHANCEMENT: Prevent image search queries all images in the site initially when the page is loaded (from r106194)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:27:38 +00:00
Ingo Schommer
cd4fecb0ee BUGFIX: fix query error when image search doesn't use legacy search (from r106183)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:36:47 +00:00