Ingo Schommer 9856fcef21 Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	javascript/DateField.js
	model/DataQuery.php
	model/Versioned.php
	tests/forms/RequirementsTest.php
	tests/model/DataObjectLazyLoadingTest.php
	view/Requirements.php

2013-04-09 14:45:35 +02: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

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

config-form.html

BUG Database config values aren't escaped

2013-03-24 01:05:33 +13:00

config.rb

ENHANCEMENT Installer styling, moving away from blackcandy

2012-04-11 22:51:10 +12:00

DatabaseAdapterRegistry.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

DatabaseConfigurationHelper.php

MINOR Update @package values to match renaming sapphire

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

install.js

ENHANCEMENT Installer styling, moving away from blackcandy

2012-04-11 22:51:10 +12:00

install.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

install.php5

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-04-09 14:45:35 +02:00

MySQLDatabaseConfigurationHelper.php

MINOR Fixed phpdocs

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

php5-required.html

ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.

2012-10-05 17:00:39 +13:00