Damian Mooyman 5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # dev/DevelopmentAdmin.php # docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md # lang/cs.yml # lang/lt.yml		2016-02-24 17:29:06 +13:00
..
api	Merge remote-tracking branch 'origin/3.2' into 3	2015-12-22 14:07:52 +13:00
assets	FIX extra_requirements to accept non associative arrays.	2013-06-02 13:37:34 +12:00
behat	Add three column layout to Page content view	2015-07-02 10:22:24 +12:00
cache	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
control	Format for SS3 using tabs instead of spaces	2015-12-08 15:19:24 +11:00
core	Merge remote-tracking branch 'origin/3.2' into 3	2015-11-03 13:06:39 +13:00
dev	Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:06:06 +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	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-24 11:33:53 +13: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 remote-tracking branch 'origin/3.2' into 3.3	2016-02-24 17:29:06 +13: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	Removed whitespaces	2015-10-07 09:33:02 +03:00
security	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-01-19 15:08:24 +13: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	[ss-2015-021] Fix rewrite hash links XSS	2015-11-11 17:46:27 +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	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
FakeController.php	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +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