Hamish Friedlander 0a79ac3592 Merge branch 'origin/3.1' ...

Conflicts:
	templates/forms/CheckboxSetField.ss
	templates/forms/FormField_holder.ss
	templates/forms/OptionsetField.ss

2013-07-19 16:25:38 +12:00

..

api

Adding test to prove issue with HTTP Header parsing in RestfulService

2013-07-10 12:47:13 +01:00

assets

FIX extra_requirements to accept non associative arrays.

2013-06-02 13:37:34 +12:00

behat

Flag "insert image" behat test as @assets

2013-06-28 12:21:00 +02:00

cache

Method visibility according to coding conventions

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

control

Merge branch '3.1'

2013-07-09 13:42:32 +10:00

core

Merge branch 'origin/3.1'

2013-07-19 16:25:38 +12:00

dev

FIX: If CSV column mapping maps to function, keep key value as key.

2013-05-14 22:00:52 +12:00

filesystem

Updating FileTest to use the correct shortcode format with commas

2013-06-01 11:25:10 +12:00

forms

Merge branch 'origin/3.1'

2013-07-19 16:25:38 +12:00

i18n

NEW Merge i18nTextCollector with existing (fixes #1838)

2013-06-02 20:17:28 +02:00

injector

Remove duplicate parse_class_spec method.

2013-05-05 11:43:56 +12:00

integration

FIX We still need XML escaping on href attributes in HTML4Value

2013-04-18 09:13:24 +12: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.1'

2013-07-05 11:56:31 +12:00

oembed

FIX Remove instances of lines longer than 120c

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

parsers

FIX Unquoted shortcodes weren't parsed (fixes #680)

2013-04-26 01:00:13 +02:00

phpcs

Add code-sniffs other than line length to scrutinizer

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

search

Coding conventions, PHPDoc cleanup

2013-06-15 12:06:24 +12:00

security

Member.lock_out_delay_mins configurable, password security docs

2013-07-11 09:47:28 +02:00

tasks

Method visibility according to coding conventions

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

templates

FEATURE: <% include %> inherits iterator scope of parent template

2013-07-07 12:39:42 +00:00

testing

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

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

view

FEATURE: <% include %> inherits iterator scope of parent template

2013-07-07 12:39:42 +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

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

phpcs_runner.php

Add code-sniffs other than line length to scrutinizer

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

PhpSyntaxTest.php

FIX Remove instances of lines longer than 120c

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