Ingo Schommer df0bed523c removed doubled merge() method (caused by merging in branches/2.0-inform) ...

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45543 467b73ca-7a2a-4603-9d3b-597d59a354a9

2007-11-24 05:31:38 +00:00

..

control

switch externals to trunk.

2007-11-23 01:10:19 +00:00

model

removed doubled merge() method (caused by merging in branches/2.0-inform)

2007-11-24 05:31:38 +00:00

ArrayData.php

Fixed up strange code formatting. Now in line with coding conventions at doc.silverstripe.com/doku.php?id=coding-conventions

2007-10-20 08:36:47 +00:00

ArrayLib.php

Moved Sapphire module to open source path

2007-07-19 10:40:28 +00:00

ClassInfo.php

isset()-check in ready()

2007-09-16 17:24:24 +00:00

Convert.php

lperera: Fixed error message - Convert::raw2html is deprecated. (merged from branches/gsoc)

2007-09-14 01:21:37 +00:00

Cookie.php

Moved Sapphire module to open source path

2007-07-19 10:40:28 +00:00

Core.php

the silverstripe-cache folder is now named according to the location of the silverstripe install, meaning that there are no clashes of permissions on shared servers (merged from branches/2.2.0, r44847)

2007-11-15 22:33:35 +00:00

Debug.php

#1586 - Object.php contains request parameter 'debugmethods'

2007-11-07 23:46:00 +00:00

Email.php

parents-merge 33138 - Added IsEmail boolean to email templates

2007-11-19 01:14:10 +00:00

Extension.php

Moved extension/decorator system from DataObject to Object, so that any object in the system can be extended

2007-08-16 06:32:49 +00:00

HTTP.php

merge changest 35230

2007-11-20 23:53:53 +00:00

i18n.php

formatting for CLI

2007-11-11 22:44:40 +00:00

ManifestBuilder.php

Fixed reverting of database code

2007-10-03 00:10:03 +00:00

Object.php

#1586 - Object.php contains request parameter 'debugmethods'

2007-11-07 23:46:00 +00:00

Requirements.php

Normal requirements fails quietly when there is no css, so themed requirements should do the same

2007-08-06 23:24:22 +00:00

Session.php

Session class updates with the changes, rather than completely overwriting. This makes it easier for legacy apps to access directly.

2007-11-19 03:12:29 +00:00

SSViewer.php

bfojcapell: i18n part modified to avoid the final semicolon

2007-09-16 16:14:28 +00:00

ViewableData.php

merge changest 35230

2007-11-20 23:54:13 +00:00