Dan Hensby 64ceba133c Merge remote-tracking branch 'origin/3.2' into 3 ...

Conflicts:
	admin/css/screen.css

2015-07-20 14:08:36 +00: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

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

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-06-19 10:48:07 +12:00

core

FIX Imported namespaces now correctly used to determine class inheritance

2015-06-20 16:09:10 +01:00

dev

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-06-19 10:48:07 +12:00

email

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +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 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

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12: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

Remove all redundant whitespace

2014-08-19 09:17:15 +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

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

…

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