Damian Mooyman f4b13fb2c4

Merge remote-tracking branch 'origin/3.6' into 3 ...

# Conflicts:
#	model/DataQuery.php

2018-02-05 16:53:15 +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

Merge branch '3.3' into 3.4

2016-11-29 11:39:58 +00:00

cache

Remove all redundant whitespace

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

control

Merge branch '3.6' into 3

2017-12-14 15:31:51 +00:00

core

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

dev

[ss-2017-007] Ensure xls formulae are safely sanitised on output

2017-12-01 10:19:48 +13:00

email

FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.

2016-07-14 10:25:40 -07:00

filesystem

Merge branch '3.5' into 3.6

2017-11-14 12:00:53 +00:00

forms

Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6

2017-12-06 17:26:45 +13:00

i18n

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

injector

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

integration

Remove all redundant whitespace

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

javascript

MINORE: Remove training whitespace.

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

model

NEW Add php 7.2 support

2018-01-30 16:50:32 +00:00

oembed

Add unit tests for oembed autodiscover and thumbnail detection

2016-04-15 14:00:10 +12:00

parsers

Merge branch '3.5' into 3.6

2017-11-25 16:17:36 +00:00

phpcs

Add code-sniffs other than line length to scrutinizer

2013-05-23 10:39:01 +12:00

search

MINORE: Remove training whitespace.

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

security

Merge remote-tracking branch 'origin/3.6' into 3

2018-02-05 16:53:15 +13:00

tasks

Remove all redundant whitespace

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

templates

FIX: Regression with <% with / %> (fixes #5656)

2016-06-06 10:14:07 +01:00

testing

MINORE: Remove training whitespace.

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

view

Merge branch '3.5' into 3.6

2017-11-25 16:17:36 +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

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