Ingo Schommer ac45e5b9c0 Merge branch 'integration' ...

Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html

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

..

css

ENHANCEMENT Installer styling, moving away from blackcandy

2012-04-11 22:51:10 +12: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

ENHANCEMENT Installer styling, moving away from blackcandy

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

config-form.html

ENHANCEMENT Installer styling, moving away from blackcandy

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

config.rb

ENHANCEMENT Installer styling, moving away from blackcandy

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

DatabaseAdapterRegistry.php

MINOR Fixed PHP strict standard where non-variables cannot be passed by reference (from r113968)

2010-12-05 08:39:31 +00:00

DatabaseConfigurationHelper.php

MINOR Reverted r104923, as current database releases of mssql and sqlite3 modules don't support this yet (from r104924)

2010-10-15 01:17:25 +00:00

install.css

ENHANCEMENT Installer styling, moving away from blackcandy

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

install.js

ENHANCEMENT Installer styling, moving away from blackcandy

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

install.php

MINOR Update docs and version checking for PHP 5.3+

2012-04-03 09:54:55 +12:00

install.php5

Merge branch 'integration'

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

MySQLDatabaseConfigurationHelper.php

ENH: Some webhosters require username/password credentials to test for

2012-01-11 16:05:19 +01:00

php5-required.html

ENHANCEMENT Installer styling, moving away from blackcandy

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