Simon Welsh 0e0597f8cd Merge branch '3.0' into 3.1 ... Conflicts: control/Director.php dev/Backtrace.php docs/en/installation/nginx.md model/HTMLValue.php tests/model/SQLQueryTest.php		2014-03-10 22:56:27 +13:00
..
api	FIX Improve recent RestfulService fix for proxies	2013-09-20 16:26:39 +12:00
assets	FIX extra_requirements to accept non associative arrays.	2013-06-02 13:37:34 +12:00
behat	Updated Expand CMS Panel to find first visible panel and added new test file	2014-02-18 11:17:31 +13:00
cache	Make CacheTest sleep properly	2013-12-21 15:05:51 +13:00
control	Merge pull request #2537 from wilr/membervalidator	2013-10-23 03:01:15 -07:00
core	Changes to error message detection to handle the differences in HHVM	2013-12-21 13:17:47 +13:00
dev	Add support for many_many_extraField in YAML	2014-02-24 22:03:53 +13:00
email	Unit tests for Email	2013-10-09 11:51:29 +01:00
filesystem	Upload: retrieve existing File if an object without an ID is given and replaceFile=true	2014-03-04 18:02:33 +01:00
forms	NEW: Forms with invalid/expired SecurityIDs are repopulated (fixes #1891)	2014-02-09 10:19:24 +00:00
i18n	BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation	2014-01-30 15:55:14 +13:00
injector	NEW: Allow specifying a factory to use for creating services.	2014-02-03 11:30:22 +11:00
integration	FIX We still need XML escaping on href attributes in HTML4Value	2013-04-18 09:13:24 +12:00
javascript	Add codesniffer that ensures indentation is with tabs.	2012-12-12 17:33:31 +13:00
model	Merge branch '3.0' into 3.1	2014-03-10 22:56:27 +13:00
oembed	FIX oembed to avoid mixed media issues	2013-10-17 17:06:40 +13:00
parsers	API: Pass extra context information to shortcode handlers.	2013-10-09 15:05:17 +11:00
phpcs	Add code-sniffs other than line length to scrutinizer	2013-05-23 10:39:01 +12:00
search	FulltextSearchableTest doesn't clean up after itself.	2013-10-22 17:52:51 +13:00
security	Rewrote usages of error suppression operator	2014-03-05 15:48:55 +13:00
tasks	Method visibility according to coding conventions	2012-09-20 10:46:59 +02:00
templates	FEATURE: <% include %> inherits iterator scope of parent template	2013-07-07 12:39:42 +00:00
testing	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
view	Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open.	2013-12-01 07:42:37 +00: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	Setting SapphireTest::is_running_test() in PHPUnit bootstrap	2013-01-09 23:31:10 +01:00
FakeController.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
MemoryLimitTest.php	Method visibility according to coding conventions	2012-09-20 10:46:59 +02:00
phpcs_runner.php	Only have Scrutinizer check PHP files	2013-08-21 21:02:12 +12:00
PhpSyntaxTest.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00