silverstripe-cms/tests
Ingo Schommer 8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
..
behat Fixed Behat tests for preview feature 2012-12-10 18:09:55 +01:00
controller API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
model API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
reports Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:58:07 +01:00
salad MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests 2011-02-02 17:53:33 +13:00
search API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
staticpublisher API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
tasks API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
travis Hardcode travis branch on dependencies, otherwise breaks pull request builds 2013-02-18 14:19:21 +01:00