Ingo Schommer 89ce1ec991 Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters ...

Conflicts:
	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss

2012-06-20 14:13:39 +02:00

..

code

Merge pull request #528 from mango9/master

2012-06-14 16:43:20 -07:00

css

Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters

2012-06-20 14:13:39 +02:00

images

ENHANCEMENT: Change media insertion to use button and apply design

2012-06-11 10:54:48 +02:00

javascript

BUGFIX When updating the tree from EditForm, ensure we only change the

2012-06-20 21:58:23 +12:00

scss

Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters

2012-06-20 14:13:39 +02:00

templates

BUGFIX CMS Breadcrumbs and tabs as inline blocks which can span multiple lines, rather than being cropped off (fixes #6882)

2012-06-06 21:05:33 +02:00

tests

MINOR Fix broken test

2012-05-28 12:03:13 +12:00

thirdparty

BUGFIX: typeof undefined error fix

2012-05-10 15:18:52 +12:00

_config.php

BUGFIX Inlining TinyMCE HTML popup (fixes #7451)

2012-06-13 14:39:50 +02: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