Ingo Schommer e7a4eec0da Merge pull request #377 from adrexia/sapphire ... --- Added padding back into the settings panel.		2012-04-27 09:42:10 +02:00
..
code	Merge pull request #343 from halkyon/object_static_remove_deprecation	2012-04-19 14:41:45 -07:00
css	Merge pull request #377 from adrexia/sapphire	2012-04-27 09:42:10 +02:00
images	Merge branch 'integration'	2012-04-11 16:31:12 +02:00
javascript	MERGE tabs url abs	2012-04-18 16:54:57 +02:00
scss	Merge pull request #377 from adrexia/sapphire	2012-04-27 09:42:10 +02:00
templates	MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview()	2012-04-18 22:59:18 +02:00
tests	API-CHANGE sapphire folder can now be renamed.	2012-04-15 10:50:19 +12:00
thirdparty	MINOR Add newline to end of files without one	2012-04-15 10:50:19 +12:00
_config.php	BUGFIX Fixing reference to moved editor_plugin_src.js in HtmlEditorConfig settings	2012-04-17 11:56:59 +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