Andrew Short bc941c18b6 Merge branch '3.1'

2013-03-15 21:58:37 +11:00

..

api

FIX CDATA sections in HTML5 are invalid so remove from test

2013-02-18 17:02:11 +13:00

behat

NEW Show the allowed extensions as a toggle tip as per trac 7993

2012-12-19 17:00:39 +01:00

cache

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

control

Merge remote-tracking branch 'origin/3.1'

2013-02-27 13:34:03 +01:00

core

FIX Parsing docblock comments in ConfigStaticManifest

2013-03-13 11:59:49 +13:00

dev

Added test cases for exception error logging

2013-01-24 09:36:42 +01:00

filesystem

NEW Upload->replaceFile setting

2013-02-05 19:28:24 +01:00

forms

Merge branch '3.1'

2013-03-15 21:58:37 +11:00

i18n

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

2012-12-21 15:04:17 +01:00

injector

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

2013-02-18 14:15:42 +01:00

integration

API Make HTMLValue replace-able via DI

2013-03-14 12:49:02 +13:00

javascript

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

model

Merge pull request #1244 from silverstripe-rebelalliance/feature/config

2013-03-12 13:19:59 -07:00

oembed

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

parsers

FIX Make ShortcodeParser obey error_behavior in attribute scope

2013-02-22 11:34:15 +13:00

phpcs

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

search

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

security

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

2013-02-18 14:31:57 +13:00

tasks

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

templates

BUG: Pass named include argument as objects.

2013-02-14 18:31:40 +11:00

testing

NEW FixtureFactory separated out from YamlFixture

2012-12-11 17:06:27 +01:00

travis

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

2013-02-27 10:27:22 +01:00

view

API Make default_cast Text and not HTMLText

2013-03-14 12:49:03 +13: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

Setting SapphireTest::is_running_test() in PHPUnit bootstrap

2013-01-09 23:31:10 +01:00

FakeController.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

MemoryLimitTest.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

PhpSyntaxTest.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00