silverstripe-cms/code
Ingo Schommer 32478ab512 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-09-27 19:07:13 +02:00
..
batchactions Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
controllers Merge remote-tracking branch 'origin/3.1' 2013-09-27 19:07:13 +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 2013-09-27 18:50:52 +02:00
reports API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
search FIX: Rename search locale variable to avoid conflicts with locale switcher. 2013-05-11 19:31:02 +12:00