silverstripe-framework/admin
Simon Welsh 1e629f4585 Merge branch '3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
2012-09-21 14:56:56 +12:00
..
code Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
css Merge branch '3.0' 2012-08-28 16:08:57 +12:00
images ENHANCEMENT: Change media insertion to use button and apply design 2012-06-11 10:54:48 +02:00
javascript Merge branch '3.0' 2012-09-17 15:16:52 +12:00
scss Merge branch '3.0' 2012-08-28 16:08:57 +12:00
templates Merge branch '3.0' 2012-08-10 00:19:00 +02:00
tests Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
thirdparty Fix chosen dropdown width not being set. 2012-08-16 23:26:29 +02: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