silverstripe-framework/tests
Daniel Hensby a8ab5a468d Merge branch '3.1' into 3.2
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
2015-08-17 11:43:28 +01: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 pull request #4459 from kinglozzer/test-path-fixes 2015-07-31 21:16:46 +12:00
core Merge branch '3.1' into 3.2 2015-08-17 11:43:28 +01:00
dev API Disable deprecation notices by default 2015-07-16 09:56:47 +12:00
email Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
filesystem Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:38:18 +12:00
forms Merge pull request #4443 from JorisDebonnet/base64url 2015-08-10 13:56:35 +01:00
i18n Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01: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 pull request #4443 from JorisDebonnet/base64url 2015-08-10 13:56:35 +01:00
oembed Nest and unnest Config and Controller for each test and test suite 2015-06-11 16:37:25 +01:00
parsers Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:38:18 +12:00
security FIX MemberPassword history removed with with Members 2015-06-24 21:04:23 +01:00
tasks Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
templates BUG Fix default casted (boolean)false evaluating to true in templates 2015-06-12 15:47:15 +12: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.2 2015-07-31 11:38:18 +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