Daniel Hensby 24166700e8

Merge remote-tracking branch 'security/3.4.6' into 3.5.4

2017-05-29 01:02:35 +01:00

..

api

MINORE: Remove training whitespace.

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

assets

…

behat

Merge branch '3.3' into 3.4

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

cache

…

control

Merge branch '3.4' into 3.5

2017-05-26 14:57:15 +01:00

core

FIX Comments ignored by classmanifest (#6619)

2017-02-15 10:46:04 +13:00

dev

API Allow has_many fixtures to be declared with array format as well as many_many (#5944)

2016-09-12 14:01:08 +01: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

Remove unnecessary nesting of config/injector in tests

2017-05-24 16:05:39 +01:00

forms

Merge branch '3.4' into 3.5

2017-05-26 14:57:15 +01:00

i18n

MINORE: Remove training whitespace.

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

injector

MINORE: Remove training whitespace.

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

integration

…

javascript

MINORE: Remove training whitespace.

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

model

Merge branch '3.4' into 3.5

2017-05-26 14:57:15 +01:00

oembed

Add unit tests for oembed autodiscover and thumbnail detection

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

parsers

BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)

2016-12-22 10:08:46 +13:00

phpcs

…

search

MINORE: Remove training whitespace.

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

security

Merge pull request #40 from silverstripe-security/patch/3.4/ss-2017-002

2017-05-28 22:18:56 +01:00

tasks

…

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.4' into 3

2016-06-13 12:30:33 +01:00

Bare.yml

…

bootstrap.php

…

FakeController.php

…

MemoryLimitTest.php

…

phpcs_runner.php

…

PhpSyntaxTest.php

…