silverstripe-cms/code
Ingo Schommer ba57d42349 Merge remote-tracking branch 'origin/3.0' into 3.1.0
Conflicts:
	code/controllers/ContentController.php
	code/model/SiteTree.php
	tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
..
batchactions Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
controllers Merge remote-tracking branch 'origin/3.0' into 3.1.0 2013-08-20 20:59:44 +02:00
forms Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570) 2013-04-05 14:06:32 +01:00
model Merge remote-tracking branch 'origin/3.0' into 3.1.0 2013-08-20 20:59:44 +02:00
reports API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
search FIX: Rename search locale variable to avoid conflicts with locale switcher. 2013-05-11 19:31:02 +12:00