Ingo Schommer d09c071899 Merge branch 'master' into integration ... Conflicts: templates/Includes/AssetAdmin_Content.ss		2012-02-24 00:31:36 +01:00
..
AssetAdmin_Tools.ss	ENHANCEMENT Filterpanel for assetadmin	2012-02-21 16:02:54 +13:00
AssetAdmin_UploadContent.ss	MINOR Using HTML5 data attributes for denoting layout in templates	2012-02-16 18:06:53 +01:00
CMSPageAddController_Content.ss	MINOR Using HTML5 data attributes for denoting layout in templates	2012-02-16 18:06:53 +01:00
CMSPageHistoryController_Tools.ss	MINOR Using HTML5 data attributes for denoting layout in templates	2012-02-16 18:06:53 +01:00
CMSPagesController_Content.ss	Merge branch 'master' into integration	2012-02-24 00:31:36 +01:00
CMSPagesController_ContentToolbar.ss	MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons	2012-02-17 15:30:37 +01:00
CMSPagesController_Tools.ss	MINOR Using HTML5 data attributes for denoting layout in templates	2012-02-16 18:06:53 +01:00
CMSPageSettingsController_Tools.ss	ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process	2012-02-15 14:28:07 +01:00
CMSSettingsController_Content.ss	MINOR Fixed admin/settings panel switching (was nesting .cms-content area)	2012-02-16 13:56:33 +01:00
ReportAdmin_Content.ss	MINOR Using HTML5 data attributes for denoting layout in templates	2012-02-16 18:06:53 +01:00
ReportAdmin_Tools.ss	MINOR DOM identifiers for tools panels so that the Panel.js logic can store their expansion state in a cookie	2012-02-16 12:34:59 +01:00
SubscribeSubmission.ss	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:42 +02:00