Ingo Schommer 1d6d24671c Merge branch 'integration' ...

Conflicts:
	code/controllers/AssetAdmin.php

2012-03-08 20:13:53 +01:00

..

CurrentPageIdentifier.php

Code cleanup: removed trailing ?> markers per code standard.

2012-02-13 12:48:41 -08:00

ErrorPage.php

Code cleanup: removed trailing ?> markers per code standard.

2012-02-13 12:48:41 -08:00

RedirectorPage.php

ENHANCEMENT Render page tree icons as stylesheets rather than $_TREE_ICONS JS definitions. Removed file/folder swapping of SiteTree::$icon, use relative file path including extension instead.

2011-12-19 14:03:42 +01:00

SiteConfig.php

ENHANCEMENT Using chosen.js selection instead of a TreeDropdownField to select groups in SiteConfig->getCMSFields() and SiteTree->getCMSFields()

2012-03-05 18:42:42 +01:00

SiteTree.php

Merge branch 'integration'

2012-03-08 20:13:53 +01:00

SiteTreeDecorator.php

MINOR: Use Deprecation class to indicated deprecated methods in cms.

2011-10-29 17:41:06 +13:00

SiteTreeExtension.php

API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.

2011-04-15 19:37:15 +10:00

SiteTreeFileExtension.php

BUGFIX Disable subsites filtering in File->BackLinkTracking() if module is installed (AIR-66)

2011-10-07 08:59:23 +02:00

SiteTreeFolderExtension.php

API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.

2011-04-15 19:37:15 +10:00

VirtualPage.php

ENHANCEMENT #6828 (Trac): Add a canonical link tag to the meta tags of Virtual Pages

2012-03-02 10:59:15 -08:00