silverstripe-framework

mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00

History

Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3

Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php

2015-02-20 10:17:19 +13:00

css

MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well

2012-04-11 16:49:31 +02:00

images

ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites.

2012-04-05 11:18:11 +12:00

scss

2012-04-11 16:49:31 +02:00

config-form.html

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00