Commit Graph

675 Commits

Author SHA1 Message Date
Normann Lou
433af2515c BUGFIX: merge r92502 from trunk for HtmlEditorConfig.php, merge r93934 from trunk for HtmlEditorField.js, merge r92500 from trunk for sapphire/thirdpart/tinymce-advcode/editor_plugin_src.js, aiming to solve the conflict of folder name tinymce-advcode.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93935 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
a188d2439b MINOR: reverted r93693 due to the field being required for the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
e46a8b8a13 API CHANGE: removed deprecated RestrictedText fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
eb64eec534 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/sapphire/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
9c55927a17 API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
9b56088875 BUGFIX Fixed reference to tree.css which doesn't exist because of files moving around
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Andrew O'Neil
e9e63a3bbd BUGFIX: Fix TreeDropdownFields throwing an exception.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:38 +13:00
Sean Harvey
047b3deb41 MINOR Added ComplexTableField::setController() which makes testing useful for switching between controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:37 +13:00
Will Rossiter
137a67845c 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/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:36 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:35 +13:00
Sam Minnee
55680174df BUGFIX: use second argument only if its an array (from r90927)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:32 +13:00
Sam Minnee
1694546870 API CHANGE: Allow fieldList arguments to Form::loadDataFrom() and Form::saveInto(), for situations where the data passed only applies to a segment of the form. (from r90872)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13:00
Sam Minnee
ef5ffe52a1 API CHANGE: Inserting $HiddenFields into a form template will show the input tags of all the hidden fields. (from r90871)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13:00
Sam Minnee
e3fa5cae7f BUGFIX: Fix Form.FieldMap, used when constructing forms that have the HTML explicitly specified.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:14:54 +00:00
Ingo Schommer
233a8fcd85 BUGFIX: was being passed to foreach without a check to see if it's an array or not. (from r86202)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:29:21 +00:00
Ingo Schommer
06f71f6cb5 BUGFIX: Added required javascript files (behaviour, prototype, prototype_improvements) to the Field() method of TreeSelectorField.php (from r84320)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:26:57 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 03:06:31 +00:00
Sam Minnee
9a83be9140 Merge branch 'master' of git@github.com:sminnee/sapphire
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 23:26:10 +00:00
Andrew O'Neil
c4e0d45742 BUGFIX: Remove blockquote from tinymce default plugin list - blockquote isnt a plugin in tinymce3.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 02:24:09 +00:00
Andrew O'Neil
8679fd9883 FEATURE: Allow Text/Varchar fields to be configured to differentiate between NULL and empty string. (#4178, petebd)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 01:29:55 +00:00
Sean Harvey
d3130e6dfe API CHANGE Fixed change in r89716 to be more semantic with FileIFrameField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 05:54:12 +00:00
Sean Harvey
7f7e3a0ba3 API CHANGE: TableListField customQuery and customCsvQuery won't automatically include ID, ClassName, and RecordClassName fields (from r87354)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:36:33 +00:00
Sean Harvey
2cc2f41b45 BUGFIX: disabling user ability to upload images into the CMS from their local computer (from r82573)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:26:01 +00:00
Sean Harvey
25e7f4413b BUGFIX Ensure that FileIFrameField gets the proper class, this could be a subclass of File instead
MINOR Make use of dataClass() in FileIFrameField instead of calling the same has_one() method in multiple places
(from r82175)



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:23:14 +00:00
Sean Harvey
e343391bfe MINOR Fixed invalid argument foreach() on CheckboxSetField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89342 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 23:33:13 +00:00
Ingo Schommer
6478062ceb BUGFIX Removed 'name' attribute from HeaderField markup - its invalid HTML to put in <h*> elements (#4623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89333 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 00:01:55 +00:00
Sam Minnee
dfd45fb7fd BUGFIX: Fixed diabled image references for edit and delete links in CTF (from r88967)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:19 +00:00
Sam Minnee
96e449225e BUGFIX: If a CTF without a show action is made readonly, don't add the show action back. (from r88960)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:07 +00:00
Sam Minnee
5ec83b9bd0 BUGFIX: Fixed resolution of amibiguous has_many foreign keys in ComplexTableField to use the same logic as DataObject (from r88945)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:38:57 +00:00
Sam Minnee
5082cd8ffb MINOR removed debugging statement (from r88627)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:35 +00:00
Sam Minnee
3965ac5237 MINOR don't show invalid version links (from r88147)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:09 +00:00
Sam Minnee
7dd6d10cde MINOR added more documentation around SiteConfig. Also wrote unit tests for permissions inheritance off it. (from r86132)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89164 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:53:15 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:13 +00:00
Andrew Short
1ccdcbac5d API CHANGE: Updated Form->FormAction() to use Controller::join_links() rather than relying on the action parameter (to preserve b/c).
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88991 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:05 +00:00
Andrew Short
5adfc28a43 BUGFIX: Reset broken file & link flags in HtmlEditorField->saveInto() before determining if a record contains broken links.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88989 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:04 +00:00
Andrew Short
26ece45bb0 BUGFIX: Stopped HtmlEditorField->saveInto() from dying when encountering a link that cannot be made relative.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 01:45:01 +00:00
Andrew Short
9b4d9993a4 FEATURE: Added SS_HTMLValue to provide a simple wrapper around DOMDocument to allow the manipulation of HTML snippets.
FEATURE: Re-instated broken link highlighting by manually checking all shortcodes in HtmlEditorField->Field(), and adding a class to broken ones.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88510 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:27 +00:00
Andrew Short
f29eceecff API CHANGE #3724: Unified the Link() method to accept an action parameter.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:16 +00:00
Andrew Short
e533719d06 BUGFIX: Use Link() on the controller to generate to form action path.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:14 +00:00
Andrew Short
1859ba502b FEATURE: Updated HtmlEditorField to use DOMDocument to more reliably parse image tracking and shortcode link tracking data.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:13 +00:00
Andrew Short
73b0ea643f ENHANCEMENT #3279: Updated the link inserter to insert a shortcode rather than a plain HTML link.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:12 +00:00
Andrew Short
264b484e82 ENHANCEMENT: Refactored TreeDropdownField to generate and manage the tree using Hierachy's ParentID data, rather than relying on the client.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:05 +00:00
Andrew Short
fd7b322ed4 MINOR: Removed un-used HtmlEditorField button generation code that has been replaced with HtmlEditorConfig.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:55 +00:00
Ingo Schommer
a0fd987b29 BUGFIX Filter both 'available' and 'new' languages in LanguageDropdownField for canTranslate() permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 20:40:22 +00:00
Will Rossiter
af9e4f59f5 MINOR: Reverted previous commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 03:37:05 +00:00
Will Rossiter
620aa651aa FEATURE: added extend() call to enable FieldHolder() html to be customized via extensions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 02:17:19 +00:00
Sean Harvey
b77d088d47 Merged in parent::__construct() additions from branches/2.3 - r83580 and r83587
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-18 03:02:19 +00:00
Geoff Munn
69563972e5 MINOR FIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:18:43 +00:00
Geoff Munn
41b700d163 MINOR FIX: backticks converted to quotes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:16:12 +00:00