Ingo Schommer bcc73de85e Merge branch '106-add-edit-records-rc' ... Conflicts: admin/code/LeftAndMain.php admin/css/screen.css admin/scss/_style.scss admin/templates/Includes/LeftAndMain_EditForm.ss css/GridField.css filesystem/Folder.php forms/gridfield/GridField.php forms/gridfield/GridFieldDefaultColumns.php forms/gridfield/GridFieldPopupForms.php		2012-02-27 23:58:10 +01:00
..
code	Merge branch '106-add-edit-records-rc'	2012-02-27 23:58:10 +01:00
css	Merge branch '106-add-edit-records-rc'	2012-02-27 23:58:10 +01:00
images	MINOR Added more fugue sprites	2012-02-23 23:29:59 +01:00
javascript	Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12'	2012-02-23 23:38:29 +01:00
scss	Merge branch '106-add-edit-records-rc'	2012-02-27 23:58:10 +01:00
templates	Merge branch '106-add-edit-records-rc'	2012-02-27 23:58:10 +01:00
tests	Clean up trailing ?> per coding standard	2012-02-12 12:40:16 -08:00
thirdparty	MINOR Customized jQuery.layout.js to support fetching layout type through HTML5, for easier readability and avoiding the $.metadata dependency (which fails to parse HTML5 data attrs correctly)	2012-02-17 13:35:54 +01:00
_config.php	ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer.	2012-02-14 13:53:35 +01: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