Ingo Schommer 14a56c18e9 Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	control/Director.php

2013-02-07 21:45:16 +01:00

..

api

SimpleXML string casting in tests for older PHPUnit

2012-12-17 15:52:01 +01: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.0' into 3.1

2013-02-07 21:45:16 +01:00

core

FIX Handle namespaced classes in Object::parse_class_spec()

2012-12-18 15:00:45 +13:00

dev

Added test cases for exception error logging

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

filesystem

BUG GD::greyscale did not correctly preserve alpha component of images Added test cases to test greyscale operation across various image formats Replaced various magic numbers with IMAGETYPE_XXX definitions

2012-12-04 09:47:26 +01:00

forms

NEW Disable items in DropdownField and GroupedDropdownField

2013-01-11 16:32:20 +01:00

i18n

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

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

injector

Merge pull request #1019 from nyeholt/injector_convert_service_params

2012-12-12 01:07:47 -08:00

integration

BUG Fixing regression in 26d70d6fca with formatted output in SS_HTMLValue

2012-10-16 11:59:30 +13:00

javascript

Add codesniffer that ensures indentation is with tabs.

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

model

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

2013-01-30 12:46:24 +01:00

oembed

FIX Remove instances of lines longer than 120c

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

parsers

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +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-01-30 12:46:24 +01:00

tasks

Method visibility according to coding conventions

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

templates

BUG Only include processed requirements at the top level. (Fixes #7847)

2012-11-04 17:54:09 +13: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

2012-12-14 10:57:28 +01:00

view

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +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