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

Conflicts:
	code/reports/Report.php
	composer.json

2013-01-21 11:24:05 +01:00

..

behat

Fixed Behat tests for preview feature

2012-12-10 18:09:55 +01:00

controller

Fixed regression in SiteTree->getCMSActions()

2012-12-14 01:21:54 +01:00

model

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

2012-12-17 17:34:20 +01:00

reports

API: moved reports API to separate module

2013-01-17 21:58:03 +13:00

salad

MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests

2011-02-02 17:53:33 +13:00

search

Skip SearchFormTest if DB driver doesn't support fulltext

2012-12-11 15:18:58 +01:00

staticpublisher

APICHANGE: Use late static binding for Object::remove_extension()

2012-11-07 11:08:36 +13:00

tasks

BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database

2012-10-16 16:48:27 +13:00

travis

API: moved reports API to separate module

2013-01-17 21:58:03 +13:00