Commit Graph

1352 Commits

Author SHA1 Message Date
Ingo Schommer
dca8b98e72 MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() (fixes #6159) (from r113360)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@113361 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Ingo Schommer
d91759d958 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 (from r113282)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@113318 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Ingo Schommer
84dfacb254 MINOR Removed unused SecurityAdmin->MemberForm() and savemember() (see MemberTableField) (from r113281)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@113308 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Ingo Schommer
924bb63477 MINOR Removed unused SecurityAdmin->removememberfromgroup() (see MemberTableField) (from r113279)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@113307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Ingo Schommer
4c4b8bb08f BUGFIX: Don't allow direct access to PHP files in cms module. (from r108028)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@108044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Saophalkun Ponlu
37c1b8238d ENHANCEMENT: do not show comments that need moderation in the comment rss feed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@103659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Saophalkun Ponlu
88f8ff468f 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.3@103528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Ingo Schommer
e2a5021def MINOR Fixed js applying to non-tinymce textarea fields in ModelAdmin.js (fixes #5453)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@103447 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Ingo Schommer
147bdee8ea MINOR Fixed js applying to non-tinymce textarea fields in ModelAdmin.js (fixes #5453)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@103362 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Saophalkun Ponlu
111b99da4e MINOR: added moderation message for non-ajax mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@103348 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Ingo Schommer
ace268df39 BUGFIX Attribute escaping in PageCommentInterface?_singlecomment.ss (merged from r97071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@97074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Will Rossiter
787b5c9f8a NOTFORMERGE: BUGFIX: fixed overlapping buttons in modeladmin. From r96884
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@96962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Will Rossiter
284f5ee453 NOTFORMERE: BUGFIX: fixed layout issue when tinymce event handler was not removed before the load request. BUGFIX: removed back button display when no history existed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@96959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Normann Lou
a10b7018dd APICHANGE: move SubscribeSumission.ss from cms module to newsletter module, cos it is only used by newsletter module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@91130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Normann Lou
b3b0b92724 MINOR: add if condition to the SubscribeSubmission template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@91109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Ingo Schommer
85b2759f7a MINOR Reverted r90959
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@90961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Frank Winkelmann
abd92aad9e ENHANCEMENT: according to email with the changes of workflow from Ash Fogelberg dated 8 October 2009 additional stages "ToPrint", "PendingAuthorization", "ToBeRequested", "DelinkedWithoutPayment" and "DelinkedWithPayment" are added to the StateGraph; ToPrint.ss is a copy of the original New App Email; RecievedPhotoID.ss and RecievedSignature are the new email-templates as requested in the flow; New fields were added to the TaxMemberRole to keep track of sending the emails; The menu_proirity values have been altered according to the flow;
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@90959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Sam Minnee
0e3fb592df BUGFIX: Added rewriteHashlinks = 'php' option to SSViewer so that static publisher can handle internal hashlinks properly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@89612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Sam Minnee
3af58dff76 BUGFIX: Pass locale rather than language to spellchecker_languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@87869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Sam Minnee
8d51ecadea BUGFIX: Always choosing translatable default language in CMSMain->init() for TinyMCE spell checking. Always setting ->Locale in order to have it available for the spell checking (from r81716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@87867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Brent Neave
816ae894d9 MINOR: Reverted r86878
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Brent Neave
85a524abcb MINOR: CSS and templating. Added Cufon font replacement script to render h1 and h2 in DTL Argo Bold font.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
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