Commit Graph

1330 Commits

Author SHA1 Message Date
Will Rossiter
b70a187aeb BUGFIX: fixed typo in pagecomment which meant commenter url was not saved. BUGFIX: updated protector to use new format
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86573 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Will Rossiter
c0352c8566 BUGFIX: Fixed Links to Moderate Comments from the CMS and front end. MINOR: removed complextable functions which no longer get called, moved logic to the PageComment Class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86325 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Sam Minnee
814563008a BUGFIX: Tied rollback action to edit, rather than publish, permission, since it only involves editing the draft site.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@84957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Mateusz Uzdowski
6e9a91efca BUGFIX Fixing the comment's author website url being converted to lowercase: now case is not affected.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@84380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Andrew O'Neil
1947fc6b18 FEATURE: Allow different user groups to have different HtmlEditorConfigs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@84085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Andrew O'Neil
f5908eb196 FEATURE: Allow file size/extension limits to apply to the admin user as
well.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@83631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Sean Harvey
f1ab79384d BUGFIX CMSMenuItem constructor now calls parent to respect inheritance
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@83586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Sean Harvey
74d06a584d MINOR Added test for FilesystemPublisher::__construct() to ensure DataObject::defineMethods() doesn't break, even when FilesystemPublisher is disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@83582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Sean Harvey
4fff60650a BUGFIX Fixed FilesystemPublisher::__construct() not calling parent::__construct() and breaking DataObjectDecorator::load_extra_statics()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@83579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:26 +13:00
Will Rossiter
b40b29c218 MINOR: fixed page comment form disappearing when validation failed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@82778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Ingo Schommer
7b8360324e MINOR Merged r82129 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@82130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
021d03b43a MINOR: updated lang file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@82099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
6b83125b41 MINOR: removed userform specific template out of cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@82001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
60735fd813 Merged r81461 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@81965 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
f237d26f14 Merged r81460 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@81962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
8a831c79c5 BUGFIX: Fixed bugs in content differencer, and improved styling. BUGFIX: fixed notice when getting title of member which didnt exist. Merged from trunk r77661.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@81942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
bee43e68f6 MINOR: allow paragraphs to be aligned
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@81311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Will Rossiter
e68d50844a MINOR: added style as a valid attribute to headers and spans to allow align to work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@81203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Sean Harvey
a0b19eca51 BUGFIX Fixed invalid HTML in AssetAdmin_uploadiframe.ss which could have an effect on file uploads
ENHANCEMENT Removed JS generated from PHP code in AssetAdmin::UploadForm() and placed it into AssetAdmin_uploadiframe.ss



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@80863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Sean Harvey
a82a320da4 BUGFIX WidgetAreaEditor shouldn't ever call editable segment "NoWidgets" - this is just a placeholder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Will Rossiter
44e5b0a89a BUGFIX: fixed spelling of spam protector
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Ingo Schommer
85901eeba7 BUGFIX Removing operating system limitations for Flash Player checks which determine showing/hiding of upload button (which currently requires exactly FP9 in our version of SWFUpload). See #3679 and #3023 for followup tickets.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Ingo Schommer
0ca7341b04 MINOR Typo (see #4164)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Ingo Schommer
db09cdc420 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Ingo Schommer
2ab097faee MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@78081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Ingo Schommer
d663843020 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Saophalkun Ponlu
233f5e79e9 Removed broken link style
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77755 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sam Minnee
61abc8c40e BUGFIX: Removed spurious console.log() functions (merged from r77552)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Julian Seidenberg
cf8a2ae0c9 BUGFIX: missing unmoderated action in CommentAdmin.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
17ff86de18 Reverted r77381
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
e33fe626d8 Reverted r77385
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77387 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
66eb9d190f Reverted r77384
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
a63bc595ff API CHANGE Removed @deprecated 2.3 JS function ingize() from LeftAndMain.js: Please use ss.i18n instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
60ff36ea47 MINOR Removed cases where GhostPage was being unset from the tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
435dea0c76 MINOR Removed unused ReportField_Controller URL rule from cms/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Andrew O'Neil
1f3b3f49cd Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Sean Harvey
03aa331441 BUGFIX WidgetAreaEditor gets it's related WidgetArea using getComponent(), a more robust way of getting the component
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Sean Harvey
30c95b1a65 MINOR Tweaked font size to be consistent with the other text in the CMS for TableField items and the URL field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77239 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Andrew O'Neil
3760e6b8c4 BUGFIX: #4082 - Translatable CMS fields layout broken in IE6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
05599ac95b MINOR: Move CMS HtmlEditorConfig configuration from _config to LeftAndMain#init. Not it's final home, but less troublesome than _config.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
f4fae2a91e BUGFIX: Add JavaScript for HtmlEditorField on every CMS page, to avoid issue where loading form with HtmlEditorField via ajax doesn't work because scripts are stripped out.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Ingo Schommer
5b53fda4e3 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
f27e284f5f ENHANCEMENT: Significant speed up for SiteTree Filter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
ddbf2e2e99 MINOR: Make return trigger search, not clear, on SiteTree Filter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
6bdb807af1 BUGFIX Fixed potential non-object error in LeftAndMain::callPageMethod()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
6c3a3677fe BUGFIX Fixed missing tinymce_template bug in ReportAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
88600e41ec MINOR Fixed faulty test case CMSMainTest->testPublish() to make use of $this->session() instead of creating a new one
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Ingo Schommer
292ccddad8 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
ac95e659f8 BUGFIX: Fix javascript error in IE caused by Changeset 76845 where reloading a page would trigger a resetChanged before the tinyMCE instance existed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Ingo Schommer
b8b84d7687 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00