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

Conflicts:
	.travis.yml
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss

2013-08-03 19:46:46 +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-08-03 19:46:46 +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

FIX Not checking stage in SiteTree#canView

2013-07-05 12:14:22 +12: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