tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity
15,375 Commits 31 Branches 527 Tags
Commit Graph

2347 Commits

Author SHA1 Message Date
Ingo Schommer
4ca6a29aad ENHANCEMENT Added support for loading external plugins (with relative paths) in HtmlEditorConfig. This means relative paths can be separate from the plugin name, and fixes a bug where paths containing dashes were ignored by TinyMCE.init(). 
ENHANCEMENT Changed sapphire/thirdparty/tinymce-advcode to use the original plugin name, and specify its relative path through HtmlEditorConfig instead.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94060 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:55 +13:00
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
Sean Harvey
60f237092a BUGFIX #6299 TableListField::Link() includes $action value twice (thanks ajshort!) (from r115379) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115380 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-01-10 03:46:28 +00:00
Will Rossiter
2ed7c9c1b0 BUGFIX: fixed accessing private variable from Geoip. ENHANCEMENT: added Geoip::get_default_country_code(). Fixes #6315 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115364 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-01-09 05:55:17 +00:00
Ingo Schommer
e4c586f78e BUGFIX Checking for existence of FormAction in Form->httpSubmission() to avoid bypassing $allowed_actions definitions in controllers containing this form 
BUGFIX Checking for $allowed_actions in Form class, through Form->httpSubmission()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115182 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-20 00:00:38 +00:00
Ingo Schommer
05eca28c96 MINOR Using Convert::raw2xml() in LabelField->Field() (fixes #6267, thanks odraska) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115125 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-16 08:12:21 +00:00
Will Rossiter
815e9efd94 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/sapphire/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 05:43:08 +00:00
Sean Harvey
ec661a9886 ENHANCEMENT #6228 FieldSet::addFieldsToTab() now allows inserting before a field name for consistency with addFieldToTab() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 02:31:49 +00:00
Will Rossiter
1ca5ea6fb4 FEATURE: added ability to define a default configuration set for date field. PATCH via gigtech. Fixes (#6131). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114816 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 02:26:59 +00:00
Sam Minnee
c24ed58d2d BUGFIX Better checking of file validity (#6093) Thanks Pigeon (from r113419) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114533 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:34:42 +00:00
Sam Minnee
854e0e30b4 ENHANCEMENT Added Form->enableSecurityToken() as a counterpart to the existing disableSecurityToken() (from r113284) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114531 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:30:32 +00:00
Sam Minnee
38601b96f8 BUGFIX Fixed ComplexTableField and TableListField GET actions against CSRF attacks (with Form_SecurityToken->checkRequest()) (from r113276) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:26:03 +00:00
Sam Minnee
5c0b2182ae API CHANGE Added security token to TableListField->Link() in order to include it in all URL actions automatically. This ensures that field actions bypassing Form->httpSubmission() still get CSRF protection (from r113275) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114528 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:24:58 +00:00
Sam Minnee
9ec31acacb ENHANCEMENT Added SecurityToken to wrap CSRF protection via "SecurityID" request parameter (from r113272) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114525 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:22:57 +00:00
Sam Minnee
662f581b24 BUGFIX Fixed month conversion in DateField_View_JQuery::convert_iso_to_jquery_format() (fixes #6124, thanks mbren and natmchugh) (from r113247) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114523 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:20:13 +00:00
Sam Minnee
75c6c4941c BUGFIX: Use correct language code for jquery-ui date picker for en_US (from r113107) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114520 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:17:16 +00:00
Ingo Schommer
8b220b923a ENHANCEMENT Using RandomGenerator in Form->getExtraFields() "SecurityID" token creation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114498 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 00:18:48 +00:00
Ingo Schommer
eeed9ce189 BUGFIX Don't call LinkTracking/ImageTracking relationships in HTMLEditorField->saveInto() unless we have internal links/files to save. This helps to improve CMS saving times on records with many HTMLEditorField instances 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114139 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-24 06:23:51 +00:00
Ingo Schommer
3ffa3bfe42 ENHANCEMENT: user-friendly error now present for unwanted upload file types 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114132 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-24 06:23:47 +00:00
Ingo Schommer
7700b223a3 MINOR Documentation for MoneyField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@113691 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-13 02:05:34 +00:00
Carlos Barberis
bf8afd6cac MINOR: call jquery-ui from thirdparty folder instead google api (see ticket 5915) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@113656 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-11 04:45:31 +00:00
Sam Minnee
b40544e694 BUGFIX #6066 Form::__construct() should respect hasMethod on passed in Controller instance if it's available (thanks paradigmincarnate!) (from r111890) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 05:04:58 +00:00
Sam Minnee
89c3349a1c BUGFIX More common defaults for en_US.xml used by Zend_DateFormat (and DateField/DatetimeField), with less error prone numerical format replacing the Zend default of shortened month names (fixes #6071, thanks dalesaurus) 
BUGFIX Correct locale mapping in DateField_View_JQuery for "en_US" and "en_NZ"
MINOR Fixed form validation message in DateField to include actual date format, rather than a hardcoded value (from r111843)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112928 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 05:01:18 +00:00
Sam Minnee
9bed2ca4f3 BUGFIX RFC 2822 compliant validation of email adresses in EmailField->jsValidation() and EmailField->validate() (fixes #6067, thanks paradigmincarnate) (from r111841) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112925 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 04:57:52 +00:00
Sam Minnee
3388642d6b MINOR Fixed documentation in CheckboxSetField (fixes #6068, thanks paradigmincarnate) (from r111788) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112922 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 04:53:24 +00:00
Sam Minnee
29515b2e01 BUGFIX Removing overloaded TableField->sourceItems() method, which enables features of the underlying TableListField implementation, such as pagination and source item caching (fixed #5965, thanks martijn) (from r111492) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112907 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 03:56:23 +00:00
Sam Minnee
cdb04f79de BUGFIX Fixed quoting and GROUP BY statement in ManyManyComplexTableField->getQuery() for Postgres compatibility (from r111202) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 03:48:57 +00:00
Sam Minnee
31d442f5da BUGFIX Respecting field specific locale settings in DatetimeField and DateField when validating and saving values (fixes #5931, thanks Tjofras) (from r110889) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112864 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 03:01:03 +00:00
Sam Minnee
2d82ae6217 BUGFIX Enforcing canEdit() checks in ComplexTableField_Popup - making form readonly if the current user can't edit (from r110857) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 03:00:45 +00:00
Sam Minnee
2c60a67e09 BUGFIX Case insensitive DateField value navigation (fixes #5990, thanks gw0( (from r110838) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112851 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:40:21 +00:00
Sam Minnee
3c6512ab1a MINOR Check in TableListField->HighlightClasses() (fixes #5993, thanks lx) (from r110837) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:36:39 +00:00
Sam Minnee
9d4d7301a2 BUGFIX Passing $name in MoneyField->FieldCurrency() (fixes #5982, thanks andersw) (from r110835) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112848 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:34:31 +00:00
Sam Minnee
61bb2fe4a4 BUGFIX Removing "typography" class from HTMLEditorField container (should just apply to the contained <iframe>) (fixes #5949) (from r110809) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112847 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:33:28 +00:00
Sam Minnee
1b95077fed BUGFIX Allowing $extraClass on CheckboxField FieldHolder (fixes #5939, thanks mobiusnz) (from r110808) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:33:08 +00:00
Sam Minnee
6fa348a2cb BUGFIX Fixed boundary PHP notice case in RequiredFields::php() where a field name may not be defined in the $data array when a Form is submitted (from r110463) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112842 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:31:30 +00:00
Sam Minnee
12dd5b08e8 BUGFIX Fixed missing "Save" action input label on ComplexTableField popup form (from r110165) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112833 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:27:35 +00:00
Sam Minnee
e92a2da304 BUGFIX: $val is now cast as an int to prevent strings always returning true (YES) (from r109168) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:21:45 +00:00