Sam Minnee f51515b62a Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master ...

Conflicts:
	admin/css/screen.css

2012-03-09 16:56:43 +13:00

..

code

Merge branch 'master' of github.com:silverstripe/sapphire

2012-03-09 14:37:32 +13:00

css

Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master

2012-03-09 16:56:43 +13:00

images

BUGFIX:SSF-53 - fixed filter and reset buttons in ie7 and ie8 plus fixed an array of other ie7/8 styling bugs

2012-03-08 16:40:04 +13:00

javascript

MINOR More flexible form detection in LeftAndMain.Tree.js

2012-03-08 18:22:30 +01:00

scss

Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master

2012-03-09 16:56:43 +13:00

templates

BUG FIX: Open new window for "Help" in CMS nav

2012-03-09 14:07:12 +13:00

tests

API CHANGE: Renaming of gridfield components #6921

2012-03-09 12:54:02 +13:00

thirdparty

MINOR Updated chosen.js from 0.9.5 to 0.9.7

2012-03-05 17:41:49 +01:00

_config.php

ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field

2012-03-07 13:32:42 +01:00

.gitignore

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

config.rb

MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver

2011-12-20 17:46:43 +01:00