Damian Mooyman 69c9ad1428 Merge remote-tracking branch 'origin/3' ...

# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml

2016-01-25 16:15:41 +13:00

..

api

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

assets

FIX extra_requirements to accept non associative arrays.

2013-06-02 13:37:34 +12:00

behat

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

cache

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

control

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

core

Merge remote-tracking branch 'origin/3'

2016-01-25 16:15:41 +13:00

dev

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13: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'

2016-01-20 13:16:27 +13:00

forms

Replaced obsolete mime types

2016-01-24 18:15:47 +13:00

i18n

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

injector

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

integration

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

javascript

Replaced obsolete mime types

2016-01-24 18:15:47 +13:00

model

Merge remote-tracking branch 'origin/3'

2016-01-25 16:15:41 +13:00

oembed

Nest and unnest Config and Controller for each test and test suite

2015-06-11 16:37:25 +01:00

parsers

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13: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'

2016-01-20 13:16:27 +13:00

security

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

tasks

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

templates

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

testing

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

view

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

Bare.yml

MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests. (from r94429)

2009-12-16 05:40:59 +00: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