Ingo Schommer cf304044b8 Merge branch 'master' into integration

2012-04-10 00:39:29 +02:00

..

code

Merge branch 'master' into integration

2012-04-10 00:39:29 +02:00

css

BUGFIX: fixed a couple of minor bugs - X-scrolling to 9999em on ModelAdmin and padding on active tabs in pages.

2012-04-10 09:02:24 +12:00

images

ENHANCEMENT: Rightlick submenu styles and ability to add page with pagetype

2012-04-09 21:08:19 +02:00

javascript

Merge branch 'master' into integration

2012-04-10 00:39:29 +02:00

scss

BUGFIX: fixed a couple of minor bugs - X-scrolling to 9999em on ModelAdmin and padding on active tabs in pages.

2012-04-10 09:02:24 +12:00

templates

MINOR: add 'edit-profile-popup' as extra popup class

2012-04-03 12:50:13 +12:00

tests

ENHANCEMENT Addition of ModelAdmin::getExportFields() which allows ModelAdmin classes to customise which fields should be exported. Defaults to the summary fields from the model class definition.

2012-03-25 20:01:43 +13:00

thirdparty

BUGFIX Fixed History.js library handling of relative URLs combined with a base URL (was causing infinite loops, e.g. /admin/#/admin/admin/admin/security) (#7002)

2012-03-30 16:51:42 +02:00

_config.php

Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this.

2012-03-12 16:03:13 +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