Ingo Schommer 2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: admin/javascript/LeftAndMain.js tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php tests/control/ControllerTest.php		2013-06-19 14:03:43 +02:00
..
code	Merge pull request #2084 from chillu/pulls/cmsform	2013-06-18 14:41:51 -07:00
css	Merge pull request #2099 from chillu/pulls/insert-media-tweaks	2013-06-18 21:32:00 -07:00
images	Fixed Tab floating in CMS (fixes #1778)	2013-06-13 00:04:56 +02:00
javascript	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-06-19 14:03:43 +02:00
scss	Merge pull request #2099 from chillu/pulls/insert-media-tweaks	2013-06-18 21:32:00 -07:00
templates	FIX: Set ModelAdmin tab targets to avoid creating new panels	2013-03-29 01:41:31 +11:00
tests	FIX extra_requirements to accept non associative arrays.	2013-06-02 13:37:34 +12:00
thirdparty	Updated history.js dependency	2013-03-20 00:46:32 +01:00
_config.php	NEW: More helpful message for 'sake dev/build' on new envs.	2013-05-30 16:49:43 +12: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