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
..
api	ENHANCEMENT: Added allowed actions to core classes	2011-02-14 11:14:51 +13:00
control	ENHANCEMENT Added SS_HTTPResponse->setStatusDescription() as equivalent to setStatusCode(). Added documentation.	2011-02-02 14:20:02 +13:00
dev	ENHANCEMENT Added BulkLoader->deleteExistingRecords(), removed unnecessary parameters from BulkLoader->load() (merged from r94250)	2011-02-02 14:18:30 +13:00
fieldtypes	BUGFIX: Only highlight strings more than 2 characters long. #4949	2011-02-02 14:19:36 +13:00
filesystem	MINOR #6083 FileTest doesn't remove test folders and files created during test	2011-02-02 14:19:57 +13:00
forms	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
i18n	BUGFIX Check for valid locale in i18n::set_locale()/set_default_locale()/include_locale_file()/include_by_locale() (as defined in i18n::$allowed_locales). Implicitly sanitizes the data for usage in controllers. (from r114469)	2011-02-02 14:20:03 +13:00
integration	BUGFIX Ensure that \r carriage return characters get stripped out before setting content in HTMLValue::setContent(). DOMDocument will transform these into &#13 entities, which is apparently XML spec, but not necessary for us as we're using HTML	2011-02-02 14:19:57 +13:00
javascript	MINOR Moved js unit tests from sapphire/javascript/tests to sapphire/tests/javascript to have a consistent location for all tests on server- and clientside	2008-11-01 11:05:38 +00:00
model	API CHANGE Using i18n::validate_locale() in various Translatable methods to ensure the locale exists (as defined through i18n::$allowed_locales) (from r114470)	2011-02-02 14:20:03 +13:00
salad/step_definitions	MINOR: Clear out the test database in between each salad scenario.	2011-02-02 14:19:45 +13:00
search	BUGFIX Populates the page with fake data in order to pass subsequent unit tests	2011-02-02 14:20:05 +13:00
security	BUGFIX Avoid potential referer leaking in Security->changepassword() form by storing Member->AutoLoginHash in session instead of 'h' GET parameter (from r114758)	2011-02-02 14:20:05 +13:00
tasks	MINOR Fixed unit tests after change Member->checkPassword() to return ValidationResult instead of boolean (see r98268)	2011-02-02 14:18:25 +13:00
templates	MINOR: Added missing file for r101867	2011-02-02 14:19:09 +13:00
testing	API CHANGE: Don't generate TestOnly DataObjects in the database immediately; instead let test developers specify them in SapphireTest::$extraDataObjects.	2011-02-02 14:18:04 +13:00
widgets	MINOR: Added explicit listing of testonly dataobjects for widget tests.	2011-02-02 14:18:08 +13:00
ArrayDataTest.php	ENHANCEMENT: added getter to get array back out of an ArrayData instance. MINOR: updated docblocks in ArrayData	2011-02-02 14:19:39 +13:00
ArrayLibTest.php	ENHANCEMENT Use array_combine() instead of custom logic for ArrayLib::valuekey() (thanks paradigmincarnate!)	2011-02-02 14:19:35 +13:00
Bare.yml	MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests.	2011-02-02 14:17:57 +13:00
bootstrap.php	MINOR Don't use chdir(), it confuses the hell out of phpunit (e.g. directory_exists() and realpath() no longer work as expected)	2011-02-02 14:19:52 +13:00
CacheTest.php	MINOR: Speed up cache test (1s is as good a test expiry as 8s)	2011-02-02 14:18:28 +13:00
ClassInfoTest.php	BUGFIX: Fixed issues with broekn link tracking	2011-02-02 14:19:02 +13:00
ControllerTest.php	ENHANCEMENT: Added allowed actions to core classes	2011-02-14 11:14:51 +13:00
ControllerTest.yml	MINOR Added ControllerTest for $allowed_actions with permission codes, switched this class to extend FunctionalTest and use get() instead of Director:;test() for this purpose (better login/session mocking capabilities)	2009-09-10 06:34:40 +00:00
ConvertTest.php	ENHANCEMENT: html2raw now properly replace strong tag with asterix #5494	2011-02-02 14:19:37 +13:00
CoreTest.php	MINOR #6397 CoreTest should use test specific paths, otherwise conflicts can occur in certain environments (from r115854)	2011-01-26 22:51:08 +00:00
DataObjectDecoratorTest.php	BUGFIX #5337: Allow decoration of DataObject	2011-02-02 14:19:11 +13:00
DataObjectDecoratorTest.yml	APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality	2010-12-11 05:43:08 +00:00
DataObjectSetTest.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
DataObjectSetTest.yml	APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality	2010-12-11 05:43:08 +00:00
DataObjectTest.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
DataObjectTest.yml	BUGFIX: TeamComment table added to dataobjects list	2011-02-02 14:19:04 +13:00
ErrorPageTest.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
ErrorPageTest.yml	BUGFIX Fixed empty ErrorPage types in output by setting status code in init() instead of index() and checking for "index" action - introduced in r75096 (see #3960)	2009-05-04 02:20:57 +00:00
FileLinkTrackingTest.php	API CHANGE Don't reflect changes in File and Folder property setters on filesystem before write() is called, to ensure that validate() applies in all cases. This fixes a problem where File->setName() would circumvent restrictions in File::$allowed_extensions (fixes #5693)	2011-02-02 14:19:34 +13:00
FileLinkTrackingTest.yml	BUGFIX: Fixed image link rewriting and added a test. (from r89011)	2009-10-15 22:40:06 +00:00
FullTestSuite.php	ENHANCEMENT Added "module=" argument to FullTestSuite (to support comma-separated module lists)	2011-02-02 14:19:53 +13:00
GeoipTest.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
HtmlEditorConfigTest.php	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().	2011-02-02 14:17:55 +13:00
HTTPRequestTest.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
HTTPTest.php	BUGFIX: preserve the port value if given in HTTP::setGetVar (#5280). BUGFIX: allow username only input rather than user:pass combo.	2011-02-02 14:19:08 +13:00
ManifestBuilderTest.fixture.inc	BUGFIX: Fixed manifest builder tests to not have fake data, and to test that classes can be in files with different names	2009-08-08 03:39:12 +00:00
ManifestBuilderTest.php	BUGFIX: Fixed issues with broekn link tracking	2011-02-02 14:19:02 +13:00
MemoryLimitTest.php	MINOR: Better checking of safe_mode in MemoryLimitTest	2011-02-02 14:19:31 +13:00
ModelAsControllerTest.yml	BUGFIX: When finding an old page in the 404 handler, favour existing subpages over historical ones.	2011-02-02 14:19:21 +13:00
ObjectStaticTest.php	BUGFIX #4929: Fixed Object::add_static_vars() for uninherited static.s	2011-02-02 14:18:14 +13:00
ObjectTest.php	BUGFIX: Update Object::parse_class_spec() to handle arrays.	2011-02-02 14:19:01 +13:00
PhpSyntaxTest.php	MINOR PHPUnit annotations for PhpSyntaxTest	2011-02-02 14:19:52 +13:00
RedirectorPageTest.php	BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found	2011-02-02 14:19:06 +13:00
RedirectorPageTest.yml	BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found	2011-02-02 14:19:06 +13:00
RequestHandlingTest.php	ENHANCEMENT: Added allowed actions to core classes	2011-02-14 11:14:51 +13:00
SearchContextTest.php	API CHANGE: Don't generate TestOnly DataObjects in the database immediately; instead let test developers specify them in SapphireTest::$extraDataObjects.	2011-02-02 14:18:04 +13:00
SearchContextTest.yml	BUGFIX Fixed SQL syntax error in MATCH AGAINST clause in FulltextFilter	2009-05-24 21:27:48 +00:00
SessionTest.php	MINOR Remove all session data in TestSession that might've been set by the test harness (necessary for test runs through the phpunit binary)	2011-02-02 14:19:51 +13:00
ShortcodeParserTest.php	FEATURE: Added the Shortcode API (ShortcodeParser) to allow you to replace simple BBCode-like tags in a string with the results of a callback.	2009-10-11 00:06:57 +00:00
SiteTreeActionsTest.php	BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer	2011-02-02 14:20:06 +13:00
SiteTreeActionsTest.yml	BUGFIX Respecting SiteTree->canDelete() in SiteTree->getCMSActions()	2009-10-17 05:11:23 +00:00
SiteTreeBacklinksTest.php	API CHANGE: Added SiteTree::VirtualPages() and SiteTree::DependentPages() accessors.	2011-02-02 14:19:02 +13:00
SiteTreeBacklinksTest.yml	API CHANGE: Added SiteTree::VirtualPages() and SiteTree::DependentPages() accessors.	2011-02-02 14:19:02 +13:00
SiteTreeBrokenLinksTest.php	BUGFIX: Fixed issues with broekn link tracking	2011-02-02 14:19:02 +13:00
SiteTreeBrokenLinksTest.yml	ENHANCMENT improved reporting around broken links/files (from r88993)	2009-10-15 22:39:26 +00:00
SiteTreePermissionsTest.php	BUGFIX: ensure that pages can only be requested from staging and live	2011-02-02 14:19:49 +13:00
SiteTreePermissionsTest.yml	BUGFIX: ensure that pages can only be requested from staging and live	2011-02-02 14:19:49 +13:00
SiteTreeTest.php	BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer	2011-02-02 14:20:06 +13:00
SiteTreeTest.yml	ENHANCEMENT: Updated the SiteTree URLSegment conflict resolver to work with nested URLs.	2009-10-11 00:07:21 +00:00
SoapModelAccessTest.php	API CHANGE: Don't generate TestOnly DataObjects in the database immediately; instead let test developers specify them in SapphireTest::$extraDataObjects.	2011-02-02 14:18:04 +13:00
SoapModelAccessTest.yml	(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)	2008-08-11 03:03:52 +00:00
SQLFormatterTest.php	BUGFIX Fixed newlines working properly across different platforms - Windows, for example, won't work properly with just \n so use PHP_EOL for a cross-platform solution	2011-02-02 14:17:38 +13:00
SQLQueryTest.php	ENHANCEMENT Added argument to SQLQuery->leftJoin()/innerJoin() (#5802, thanks stojg)	2011-02-02 14:19:41 +13:00
SSViewerCacheBlockTest.php	API CHANGE: Allow cached blocks within control and if blocks, as long as that control or if block is contained within an uncached block, not a cached block	2011-02-02 14:19:09 +13:00
SSViewerTest.php	Merge branch '2.4'	2011-02-14 18:47:53 +13:00
TokenisedRegularExpressionTest.php	MINOR Unified @package PHPdoc (added where missing, removed duplicates)	2008-06-15 13:33:53 +00:00
TransactionTest.php	Reverted to revision 101592	2011-02-02 14:20:07 +13:00
ViewableDataTest.php	BUGFIX ViewableData->castingClass() cuts off last character of a casting definition if it has bracketed arguments (fixes #5536, thanks ajshort)	2011-02-02 14:19:19 +13:00
WebserverRoutingTest.php	ENHANCEMENT: Added allowed actions to core classes	2011-02-14 11:14:51 +13:00