Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: admin/templates/Includes/LeftAndMain_Menu.ss admin/templates/Includes/ModelAdmin_ImportSpec.ss admin/templates/Includes/ModelAdmin_Tools.ss admin/templates/LeftAndMain.ss admin/templates/ModelSidebar.ss i18n/i18n.php templates/ComplexTableField.ss templates/ComplexTableField_popup.ss templates/FileIFrameField_iframe.ss templates/Includes/GridFieldItemEditView.ss templates/Includes/TableListField_PageControls.ss templates/RelationComplexTableField.ss templates/TableField.ss templates/TableListField.ss		2013-08-07 17:14:47 +02:00
..
code	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-08-07 17:14:47 +02:00
css	Updated field class to use doubleborder mixin	2013-07-26 16:44:00 +02:00
images	Fixed Tab floating in CMS (fixes #1778)	2013-06-13 00:04:56 +02:00
javascript	"Insert Media" dialog: Prevent loading indicator in IE8+	2013-06-24 17:14:32 +02:00
scss	Updated field class to use doubleborder mixin	2013-07-26 16:44:00 +02:00
templates	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-08-07 17:14:47 +02: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