Sam Minnee 4aa4cd2c28 Merge branch '3.0' ...

Conflicts:
	admin/scss/ie7.scss

2012-06-22 17:20:07 +12:00

..

api

API CHANGE Moved SapphireSoapServer and SOAPModelAccess into its own module at https://github.com/silverstripe/silverstripe-soapserver (fixes #7282)

2012-06-04 10:22:48 +02:00

cache

MINOR Add newline to end of files without one

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

control

BUGFIX Avoid Session::set() clearing on existing val (fixes #7487)

2012-06-17 23:46:52 +02:00

core

API CHANGE: Don't have any instance caching in singleton(), rely on Injector for this.

2012-06-11 22:41:12 +12:00

dev

API CHANGE Removed assertType() and assertEmpty() workarounds. Use assertInstanceOf()

2012-05-09 23:05:39 +12:00

filesystem

ENHANCEMENT: remove dependencies between framework tests and cms module.

2012-06-20 16:28:06 +02:00

forms

ENHANCEMENT Disable UploadField when handling unsaved relations (fixes #7187)

2012-06-15 17:44:34 +02:00

i18n

MINOR Fixed phpdocs

2012-06-20 23:59:57 +02:00

injector

BUGFIX Moved initialisation of injector to the start of Core.php to make sure that it is initialised correctly before additional code blocks reference it (in particular some of the code introduced by Sam that is triggered during add_extension).

2012-06-14 20:28:20 +10:00

integration

MINOR Update @package values to match renaming sapphire

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

javascript

MINOR Cleaning up code of Datagrid with related classes with more tests

2011-09-29 12:16:15 +13:00

model

Merge branch '3.0'

2012-06-22 17:20:07 +12:00

oembed

ENHANCEMENT: add test to Oembed

2012-05-24 17:00:22 +12:00

parsers

BUGFIX: Handle consecutive shortcodes.

2012-05-23 18:18:06 +12:00

search

API CHANGE Removed assertType() and assertEmpty() workarounds. Use assertInstanceOf()

2012-05-09 23:05:39 +12:00

security

ENHANCEMENT: remove dependencies between framework tests and cms module.

2012-06-20 16:28:06 +02:00

tasks

ENHANCEMENT: Implement blowfish encryption and use it by default. (#7111)

2012-05-02 13:51:29 +12:00

templates

MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary.

2012-05-11 13:49:20 +12:00

testing

MINOR Update @package values to match renaming sapphire

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

view

ENHANCEMENT Adding List() in the GenericTemplateGlobalProvider so

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

Bare.yml

MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests.

2011-02-02 14:17:57 +13:00

bootstrap.php

MINOR: Fixed test

2012-05-28 16:20:28 +12:00

FakeController.php

MINOR Moving FakeController class (required for bootstrap.php) into its own file, so that autoloading doesn't execute bootstrap (which is the case when invoking TestRunner->module())

2012-04-30 15:04:59 +02:00

MemoryLimitTest.php

MINOR Update @package values to match renaming sapphire

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

PhpSyntaxTest.php

MINOR Update @package values to match renaming sapphire

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