Commit Graph

654 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Ingo Schommer
cc31e10672 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
9e177f4c10 ENHANCEMENT: Use new HtmlEditorConfig API to specify options for CMS HtmlEditorField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
0e3b4bfc88 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Hamish Friedlander
29ab106af8 ENHANCEMENT: Correct issue with SiteTree filtering not persisting and add drop down for page type and clear button. Part of a re-work of the search system
@todo: Tests, speed optimisation, proper connection of filtering with tree control checkboxes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
413b73dc0d MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
0518e205c7 API CHANGE: Made batch actions pluggable through CMSBatchActionHandler::register()
ENHANCEMENT: Added batch actions for unpublish and delete from published.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
812fad5964 BUGFIX: Fix modeladmin scrollbars in ie7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
b2aa86140a API CHANGE: Made ModelAdmin's configuration statics public rather than protected, so that they can be accessed with Object::get_static()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sean Harvey
f2aa215cce BUGFIX Ensure that template path comments don't make it into ViewArchivedEmail
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
2414eb30cc ENHANCEMENT: Added page location fields in the behaviour tab, as an alternative to drag and drop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Will Rossiter
fbac34c7c7 BUGFIX: set when ajax is disabled for commenting that we redirect manually down to the comment form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
820d6b92cd ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:17 +13:00
Ingo Schommer
f34259148c MINOR Merged Translatable fixes from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sean Harvey
15f18179d4 BUGFIX Fixed PageCommentInterface $this->class being NULL because parent::__construct() wasn't called
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
62f9202c00 BUGFIX: Fixed refactoring of getRecord() so that it can handle currentPage() calls properly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
d33c2869a7 BUGFIX: Let CMS users open pages deleted from draft; bug introduced by translatable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
7e64e2e7e8 BUGFIX #3740: Fixd duplicate tab highlight in ModelAdmin, by moving back to old tabstrip.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Sam Minnee
e9f1a7e0c4 ENHANCEMENT #3920: Alllow searching within subfolders in Files and Images section
BUGFIX: Let users open the root folder in Files and Images section

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Andrew O'Neil
859cfe66bd FEATURE: Allow Title and Navigation Label to be searched separately
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00