Ingo Schommer 3ee4459476 MERGE tabs url abs

2012-04-18 16:54:57 +02:00

..

code

MINOR Fixed controller contexts in LeftAndMain->SiteTreeAsUL() - needs different context for edit links and determining "current page" (not applicable for CMSPagesController)

2012-04-17 22:33:30 +02:00

css

ENHANCMENT:Trac#7166 - added styling for 2nd level tabs.

2012-04-18 14:28:13 +12: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 branch 'master' into 7094-combine-tree-edit-view

2012-04-18 14:19:55 +02:00

templates

MINOR Removed hardcoded children entries from CMS Menu (and record setting logic), as the related controllers have been merged to be accessible under the same top-level menu

2012-04-17 11:03:09 +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