Ingo Schommer 64357a4522 Merge branch '3.0' ... Conflicts: admin/css/screen.css admin/scss/_forms.scss docs/en/changelogs/3.0.0.md		2012-07-05 18:01:09 +02:00
..
code	FIX Santise model classes in ModelAdmin	2012-06-29 13:52:33 +12:00
css	Merge branch '3.0'	2012-07-05 18:01:09 +02:00
images	ENHANCEMENT: Change media insertion to use button and apply design	2012-06-11 10:54:48 +02:00
javascript	Smarter concat of query params in LeftAndMain.js	2012-06-29 14:23:01 +02:00
scss	Merge branch '3.0'	2012-07-05 18:01:09 +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