Sam Minnee 1e0c4ae8d1 Merge branch '2.4' ... Conflicts: cache/Cache.php cli/CliController.php core/Convert.php core/Core.php core/ManifestBuilder.php core/Object.php core/SSViewer.php core/control/ContentController.php core/control/ContentNegotiator.php core/control/FormResponse.php core/control/RequestHandler.php core/control/SilverStripeNavigatorItem.php core/i18n.php core/i18nTextCollector.php core/model/DataObjectSet.php core/model/Hierarchy.php core/model/Image.php core/model/MySQLDatabase.php core/model/SiteConfig.php core/model/SiteTree.php core/model/Translatable.php core/model/VirtualPage.php dev/Debug.php dev/SapphireTest.php dev/TestRunner.php dev/YamlFixture.php dev/install/MySQLDatabaseConfigurationHelper.php docs/en/installation/from-source.md docs/en/topics/themes.md docs/en/tutorials/4-site-search.md email/Mailer.php filesystem/File.php filesystem/Folder.php forms/ComplexTableField.php forms/CurrencyField.php forms/DateField.php forms/FieldSet.php forms/FileField.php forms/FileIFrameField.php forms/HtmlEditorConfig.php forms/HtmlEditorField.php forms/SelectionGroup.php forms/SimpleImageField.php forms/TabSet.php forms/TableField.php forms/TableListField.php forms/TreeDropdownField.php forms/TreeMultiselectField.php integration/Geoip.php javascript/SelectionGroup.js javascript/TreeSelectorField.js javascript/UpdateURL.js javascript/core/jquery.ondemand.js javascript/tiny_mce_improvements.js javascript/tree/tree.js lang/en_US.php search/ContentControllerSearchExtension.php security/Group.php security/Member.php security/PermissionCheckboxSetField.php security/PermissionRole.php security/Security.php static-main.php templates/RelationComplexTableField.ss templates/TableListField.ss tests/ConvertTest.php tests/DataObjectSetTest.php tests/DataObjectTest.php tests/DataObjectTest.yml tests/RequestHandlingTest.php tests/SSViewerTest.php tests/SiteTreePermissionsTest.php tests/SiteTreeTest.php tests/TransactionTest.php tests/api/RestfulServiceTest.php tests/control/DirectorTest.php tests/control/ModelAsControllerTest.php tests/fieldtypes/WidgetAreaEditorTest.php tests/forms/CurrencyFieldTest.php tests/forms/FormTest.php tests/model/DatabaseTest.php tests/model/ImageTest.php tests/search/ContentControllerSearchExtensionTest.php tests/security/MemberAuthenticatorTest.php thirdparty/.gitignore thirdparty/behaviour/behaviour.js thirdparty/firebug-lite/firebug.js thirdparty/firebug-lite/firebugx.js thirdparty/jquery-form/jquery.form.js thirdparty/jquery-livequery/jquery.livequery.js thirdparty/jquery-livequery/test/jquery.js thirdparty/jquery-livequery/test/test.html thirdparty/jquery-livequery/test/test2.html thirdparty/jquery-metadata/META.json thirdparty/jquery-metadata/README thirdparty/jquery-metadata/jquery.metadata.js thirdparty/jquery-metadata/test/index.html thirdparty/jquery-metadata/test/jquery.js thirdparty/jquery-metadata/test/test.js thirdparty/jquery-metadata/test/testrunner.js thirdparty/jquery-metadata/test/testsuite.css thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png thirdparty/jquery-ui/i18n/jquery-ui-i18n.js thirdparty/jquery-ui/i18n/ui.datepicker-ar.js thirdparty/jquery-ui/i18n/ui.datepicker-bg.js thirdparty/jquery-ui/i18n/ui.datepicker-ca.js thirdparty/jquery-ui/i18n/ui.datepicker-cs.js thirdparty/jquery-ui/i18n/ui.datepicker-da.js thirdparty/jquery-ui/i18n/ui.datepicker-de.js thirdparty/jquery-ui/i18n/ui.datepicker-el.js thirdparty/jquery-ui/i18n/ui.datepicker-eo.js thirdparty/jquery-ui/i18n/ui.datepicker-es.js thirdparty/jquery-ui/i18n/ui.datepicker-fa.js thirdparty/jquery-ui/i18n/ui.datepicker-fi.js thirdparty/jquery-ui/i18n/ui.datepicker-fr.js thirdparty/jquery-ui/i18n/ui.datepicker-he.js thirdparty/jquery-ui/i18n/ui.datepicker-hr.js thirdparty/jquery-ui/i18n/ui.datepicker-hu.js thirdparty/jquery-ui/i18n/ui.datepicker-hy.js thirdparty/jquery-ui/i18n/ui.datepicker-id.js thirdparty/jquery-ui/i18n/ui.datepicker-is.js thirdparty/jquery-ui/i18n/ui.datepicker-it.js thirdparty/jquery-ui/i18n/ui.datepicker-ja.js thirdparty/jquery-ui/i18n/ui.datepicker-ko.js thirdparty/jquery-ui/i18n/ui.datepicker-lt.js thirdparty/jquery-ui/i18n/ui.datepicker-lv.js thirdparty/jquery-ui/i18n/ui.datepicker-ms.js thirdparty/jquery-ui/i18n/ui.datepicker-nl.js thirdparty/jquery-ui/i18n/ui.datepicker-no.js thirdparty/jquery-ui/i18n/ui.datepicker-pl.js thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js thirdparty/jquery-ui/i18n/ui.datepicker-ro.js thirdparty/jquery-ui/i18n/ui.datepicker-ru.js thirdparty/jquery-ui/i18n/ui.datepicker-sk.js thirdparty/jquery-ui/i18n/ui.datepicker-sl.js thirdparty/jquery-ui/i18n/ui.datepicker-sq.js thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js thirdparty/jquery-ui/i18n/ui.datepicker-sr.js thirdparty/jquery-ui/i18n/ui.datepicker-sv.js thirdparty/jquery-ui/i18n/ui.datepicker-th.js thirdparty/jquery-ui/i18n/ui.datepicker-tr.js thirdparty/jquery-ui/i18n/ui.datepicker-uk.js thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js thirdparty/jquery/jquery.js thirdparty/jsmin/.piston.yml thirdparty/jsmin/jsmin.php thirdparty/prototype/prototype.js thirdparty/scriptaculous/dragdrop.js thirdparty/simplepie/.piston.yml thirdparty/spyc/.piston.yml thirdparty/spyc/README thirdparty/spyc/php4/spyc.php4 thirdparty/spyc/php4/test.php4 thirdparty/spyc/spyc.php thirdparty/spyc/spyc.yaml thirdparty/tinymce-advcode/dialog.html thirdparty/tinymce-advcode/editor_plugin_src.js thirdparty/tinymce-advcode/js/dialog.js thirdparty/tinymce/langs/en.js thirdparty/tinymce/plugins/advhr/langs/en_dlg.js thirdparty/tinymce/plugins/advhr/rule.htm thirdparty/tinymce/plugins/advimage/image.htm thirdparty/tinymce/plugins/advimage/langs/en_dlg.js thirdparty/tinymce/plugins/advlink/langs/en_dlg.js thirdparty/tinymce/plugins/advlink/link.htm thirdparty/tinymce/plugins/emotions/emotions.htm thirdparty/tinymce/plugins/emotions/langs/en_dlg.js thirdparty/tinymce/plugins/example/dialog.htm thirdparty/tinymce/plugins/fullpage/fullpage.htm thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js thirdparty/tinymce/plugins/fullscreen/fullscreen.htm thirdparty/tinymce/plugins/inlinepopups/template.htm thirdparty/tinymce/plugins/media/langs/en_dlg.js thirdparty/tinymce/plugins/media/media.htm thirdparty/tinymce/plugins/paste/js/pasteword.js thirdparty/tinymce/plugins/paste/langs/en_dlg.js thirdparty/tinymce/plugins/paste/pastetext.htm thirdparty/tinymce/plugins/paste/pasteword.htm thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js thirdparty/tinymce/plugins/searchreplace/searchreplace.htm thirdparty/tinymce/plugins/spellchecker/editor_plugin.js thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js thirdparty/tinymce/plugins/style/langs/en_dlg.js thirdparty/tinymce/plugins/style/props.htm thirdparty/tinymce/plugins/table/cell.htm thirdparty/tinymce/plugins/table/langs/en_dlg.js thirdparty/tinymce/plugins/table/merge_cells.htm thirdparty/tinymce/plugins/table/row.htm thirdparty/tinymce/plugins/table/table.htm thirdparty/tinymce/plugins/template/langs/en_dlg.js thirdparty/tinymce/plugins/template/template.htm thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm thirdparty/tinymce/plugins/xhtmlxtras/cite.htm thirdparty/tinymce/plugins/xhtmlxtras/del.htm thirdparty/tinymce/plugins/xhtmlxtras/ins.htm thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js thirdparty/tinymce/themes/advanced/about.htm thirdparty/tinymce/themes/advanced/anchor.htm thirdparty/tinymce/themes/advanced/charmap.htm thirdparty/tinymce/themes/advanced/color_picker.htm thirdparty/tinymce/themes/advanced/image.htm thirdparty/tinymce/themes/advanced/langs/en.js thirdparty/tinymce/themes/advanced/langs/en_dlg.js thirdparty/tinymce/themes/advanced/link.htm thirdparty/tinymce/themes/advanced/source_editor.htm thirdparty/tinymce/themes/simple/langs/en.js thirdparty/tinymce/tiny_mce.js thirdparty/tinymce/tiny_mce_src.js widgets/Widget.php		2011-02-14 18:47:53 +13:00
..
AjaxUniqueTextField.php	Merged from branches/2.3	2009-03-10 22:08:52 +00:00
AutocompleteTextField.php	API CHANGE Deprecated AutocompleteTextField, use third-party solutions	2011-02-02 14:19:33 +13:00
CheckboxField.php	BUGFIX Allowing $extraClass on CheckboxField FieldHolder (fixes #5939, thanks mobiusnz)	2011-02-02 14:19:49 +13:00
CheckboxSetField.php	MINOR Fixed documentation in CheckboxSetField (fixes #6068, thanks paradigmincarnate)	2011-02-02 14:19:54 +13:00
ComplexTableField.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
CompositeField.php	BUGFIX Setting brokenOnConstruct to FALSE in CompositeField::__construct() - it skips a constructor, hence breaking request handling (and therefore direct field access through /Form/Field/MyCompositeField/FieldHolder	2009-07-06 21:48:12 +00:00
ConfirmedPasswordField.php	MINOR Code formatting change in ConfirmedPasswordField::__construct()	2011-02-02 14:20:05 +13:00
CountryDropdownField.php	BUGFIX: fixed accessing private variable from Geoip. ENHANCEMENT: added Geoip::get_default_country_code(). Fixes #6315	2011-01-09 05:55:17 +00:00
CreditCardField.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
CurrencyField.php	BUGFIX CurrencyField doesn't accept negative value (#5769, thanks simon_w)	2011-02-02 14:19:42 +13:00
CustomRequiredFields.php	BUGFIX Validator/RequiredFields should not regard "0" as an empty value	2011-02-02 14:19:43 +13:00
DatalessField.php	MINOR merged branches/2.3 into trunk	2008-12-04 22:38:32 +00:00
DateField.php	BUGFIX DateField wrong datepicker-%s.js path (fixes #6296, thanks martijn)	2011-02-02 14:20:07 +13:00
DatetimeField.php	BUGFIX Respecting field specific locale settings in DatetimeField and DateField when validating and saving values (fixes #5931, thanks Tjofras)	2011-02-02 14:19:50 +13:00
DisabledTransformation.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
DropdownField.php	MINOR Cross-referencing some documentation	2011-02-02 14:19:40 +13:00
EmailField.php	BUGFIX RFC 2822 compliant validation of email adresses in EmailField->jsValidation() and EmailField->validate() (fixes #6067, thanks paradigmincarnate)	2011-02-02 14:19:55 +13:00
FieldGroup.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
FieldSet.php	MINOR Reverted r105264, breaks CompositeFieldTest, FieldSetTest, TranslatableTest	2011-02-02 14:19:27 +13:00
FileField.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
FileIFrameField.php	MINOR: change the requirement's link to use current protocol (we don't want messages from browsers saying the page has unsecured content, when accessing the CMS over SSL)	2011-02-02 14:19:57 +13:00
Form.php	BUGFIX Checking for existence of FormAction in Form->httpSubmission() to avoid bypassing $allowed_actions definitions in controllers containing this form	2011-02-02 14:20:06 +13:00
FormAction.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
FormField.php	MINOR Documentation	2011-02-02 14:19:21 +13:00
FormScaffolder.php	BUGFIX: column and table names now quoted properly	2011-02-02 14:18:59 +13:00
FormTransformation.php	Reverted r78129	2009-06-01 23:09:03 +00:00
GroupedDropdownField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
HasManyComplexTableField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
HasOneComplexTableField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
HeaderField.php	BUGFIX Removed 'name' attribute from HeaderField markup - its invalid HTML to put in <h*> elements (#4623)	2009-10-17 00:01:55 +00:00
HiddenField.php	MINOR: added $extraClass of a hidden field to its rendered html	2009-06-19 01:36:09 +00:00
HtmlEditorConfig.php	MINOR Fixed phpdoc documentation (from r103385)	2011-02-02 14:19:15 +13:00
HtmlEditorField.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
ImageField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
ImageFormAction.php	MINOR Using jquery.live instead of livequery on ImageFormAction.js	2011-02-02 14:18:55 +13:00
InlineFormAction.php	Merged from branches/2.3	2009-04-28 23:52:15 +00:00
LabelField.php	BUGFIX: removed name attribute from label fields since this is invalid html. Ticket: #4887. PATCH via tobych	2011-02-02 14:18:09 +13:00
LanguageDropdownField.php	BUGFIX Filter both 'available' and 'new' languages in LanguageDropdownField for canTranslate() permissions	2009-10-05 20:40:22 +00:00
ListboxField.php	MINOR Cross-referencing some documentation	2011-02-02 14:19:40 +13:00
LiteralField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
LookupField.php	Merged changes from 2.3 branch	2009-02-01 23:49:53 +00:00
ManyManyComplexTableField.php	BUGFIX Fixed quoting and GROUP BY statement in ManyManyComplexTableField->getQuery() for Postgres compatibility	2011-02-02 14:19:53 +13:00
MoneyField.php	BUGFIX Passing $name in MoneyField->FieldCurrency() (fixes #5982, thanks andersw)	2011-02-02 14:19:49 +13:00
NestedForm.php	MINOR phpdoc documentation	2009-03-22 22:59:14 +00:00
NullableField.php	MINOR Fixed phpdoc documentation (from r103385)	2011-02-02 14:19:15 +13:00
NumericField.php	BUGFIX NumericField javascript does not accept negatives, make use of isNaN built-in javascript function instead of custom regex	2011-02-02 14:19:44 +13:00
OptionsetField.php	MINOR Cross-referencing some documentation	2011-02-02 14:19:40 +13:00
PasswordField.php	Merged from branches/2.3	2009-04-28 23:55:53 +00:00
PhoneNumberField.php	Merged changes from 2.3 branch	2009-02-01 23:49:53 +00:00
PrintableTransformation.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
ReadonlyField.php	MINOR Documentation	2009-03-10 15:03:34 +00:00
ReadonlyTransformation.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
RequiredFields.php	BUGFIX Better checking of file validity (#6093) Thanks Pigeon	2011-02-02 14:19:59 +13:00
ResetFormAction.php	Merged from branches/2.3	2009-04-28 23:55:53 +00:00
RestrictedTextField.php	MINOR Pushed @deprecated 2.3 items out to 2.5 since they're still in use for now	2011-02-02 14:18:46 +13:00
ScaffoldingComplexTableField.php	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.	2009-10-26 03:06:31 +00:00
SelectionGroup.php	ENHANCEMENT Using jquery.live instead of livequery for SelectionGroup.js	2011-02-02 14:18:55 +13:00
SimpleImageField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
Tab.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
TableField.php	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)	2011-02-02 14:19:53 +13:00
TableListField.php	BUGFIX #6299 TableListField::Link() includes $action value twice (thanks ajshort!)	2011-02-02 14:20:06 +13:00
TabSet.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
TabularStyle.php	(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)	2008-08-06 06:54:59 +00:00
TextareaField.php	MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc	2011-02-02 14:19:38 +13:00
TextField.php	FEATURE New DatetimeField class (form field wrapper composed of DateField andTimeField)	2011-02-02 14:18:38 +13:00
TimeField.php	ENHANCEMENT Added class to time icon in TimeField so it can be styled	2011-02-02 14:19:38 +13:00
ToggleCompositeField.php	MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript	2011-02-02 14:17:52 +13:00
ToggleField.php	MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript	2011-02-02 14:17:52 +13:00
TreeDropdownField.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
TreeMultiselectField.php	MINOR Cross-referencing some documentation	2011-02-02 14:19:40 +13:00
TreeSelectorField.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
UniqueRestrictedTextField.php	MINOR Pushed @deprecated 2.3 items out to 2.5 since they're still in use for now	2011-02-02 14:18:46 +13:00
UniqueTextField.php	ENHANCEMENT Removed UniqueField.js dependency to CMS-related statusMessage() javascript class, and using jQuery even triggers instead	2009-11-21 02:31:44 +00:00
Validator.php	BUGFIX: Validator::requiredField() should check the required field submitted value is an array before check strlen(). Some fields submitted as an array, e.g. MoneyField	2011-02-02 14:19:46 +13:00