Simon Welsh 1e629f4585 Merge branch '3.0' ...

Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php

2012-09-21 14:56:56 +12:00

..

ArrayData.php

MINOR Update @package values to match renaming sapphire

2012-04-15 10:50:19 +12:00

GenericTemplateGlobalProvider.php

ENHANCEMENT Adding List() in the GenericTemplateGlobalProvider so

2012-05-29 20:04:51 +12:00

Requirements.php

Merge branch '3.0'

2012-09-21 14:56:56 +12:00

SSTemplateParser.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

SSTemplateParser.php.inc

BUG 7362 dont include trailing space in bare string

2012-07-23 15:42:58 +12:00

SSViewer.php

Merge branch '3.0'

2012-09-21 14:56:56 +12:00

TemplateGlobalProvider.php

ENHANCEMENT Replaced locations of sapphire with $ModulePath(framework) in templates, based off Controller which implements TemplateGlobalProvider

2012-04-15 10:50:20 +12:00

TemplateIteratorProvider.php

MINOR Update @package values to match renaming sapphire

2012-04-15 10:50:19 +12:00

ViewableData.php

API Deprecated Profiler class, removed related debug GET params

2012-07-05 12:02:06 +02:00