Ingo Schommer afb8465d05 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml

2013-03-29 17:37:19 +01:00

..

api

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +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.1'

2013-03-26 10:46:41 +01:00

core

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

dev

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

filesystem

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

forms

Merge remote-tracking branch 'origin/3.1'

2013-03-26 10:46:41 +01:00

i18n

API i18n::$common_languages and i18n::$common_locales converted to Config API

2013-03-27 20:42:46 +01:00

injector

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +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

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01: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

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

security

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01: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

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

view

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01: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