silverstripe-framework/tests
Damian Mooyman 1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
..
api UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
assets FIX extra_requirements to accept non associative arrays. 2013-06-02 13:37:34 +12:00
behat Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
cache Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
control Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
core Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
dev Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
email API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding 2014-09-25 16:04:56 +12:00
filesystem API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:59:21 +12:00
forms Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
i18n Merge remote-tracking branch 'origin/3.1' into 3 2015-03-11 11:40:06 +13:00
injector Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
integration Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
javascript Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
model Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
oembed Nest and unnest Config and Controller for each test and test suite 2015-06-11 16:37:25 +01:00
parsers Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
security Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
tasks Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
templates FEATURE: <% include %> inherits iterator scope of parent template 2013-07-07 12:39:42 +00:00
testing Refactor DataObject has_one/has_many/many_many methods 2015-03-13 15:15:23 +00:00
view Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12: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 Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
FakeController.php UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
MemoryLimitTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
phpcs_runner.php Only have Scrutinizer check PHP files 2013-08-21 21:02:12 +12:00
PhpSyntaxTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00