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

# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss

2016-02-25 14:51:59 +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

Update PHPUnit from 3.7 to 4.8

2016-02-24 21:42:20 +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

Removed obsolete TestRunner->$skipTests flag

2016-02-23 22:29:58 +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

API File has Versioned extension

2016-02-23 13:46:28 +13:00

forms

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +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

API Removed custom dev/tests/ execution

2016-02-23 20:19:35 +13:00

model

Merge remote-tracking branch 'origin/3'

2016-02-25 14:51:59 +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

NEW Cross device "Remember Me" feature

2016-02-10 09:42:08 +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

BUG Fix SSViewerTest not restoring old requirements

2016-01-26 11:39:53 +13:00

Bare.yml

…

bootstrap.php

API Removed custom dev/tests/ execution

2016-02-23 20:19:35 +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