Simon Welsh 8153326360 Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0 ...

Conflicts:
	admin/_config.php

2012-10-05 14:39:27 +13:00

..

code

FIX Remove instances of lines longer than 120c

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

css

ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab.

2012-09-28 16:37:35 +02:00

images

ENHANCEMENT: Change media insertion to use button and apply design

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

javascript

FIX Remove instances of lines longer than 120c

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

scss

ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab.

2012-09-28 16:37:35 +02:00

templates

Rendering attributes for CMSTabSet.ss

2012-09-28 16:37:34 +02:00

tests

FIX Remove instances of lines longer than 120c

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

thirdparty

Fix chosen dropdown width not being set.

2012-08-16 23:26:29 +02:00

_config.php

Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0

2012-10-05 14:39:27 +13: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