Daniel Hensby a8ab5a468d Merge branch '3.1' into 3.2 ...

Conflicts:
	admin/code/LeftAndMain.php
	composer.json

2015-08-17 11:43:28 +01:00

..

BackLink_Button.ss

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-08-07 17:14:47 +02:00

CMSLoadingScreen.ss

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

CMSProfileController_EditForm.ss

admin/myprofile layout after validation (fixes #2644)

2013-11-07 16:19:40 +01:00

CMSSectionIcon.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

CMSSettingsController_SilverStripeNavigator.ss

ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.

2012-10-05 16:30:47 +13:00

Editor_toolbar.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

LeftAndMain_Content.ss

UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts

2012-05-30 15:07:13 +02:00

LeftAndMain_EditForm.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

LeftAndMain_Menu.ss

Add 'sticky' behaviour to left menu

2015-05-25 12:09:14 +12:00

LeftAndMain_SilverStripeNavigator.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

ModelAdmin_Content.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

ModelAdmin_EditForm.ss

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

ModelAdmin_ImportSpec.ss

Fix for Issue #4424

2015-08-11 14:56:13 +10:00

ModelAdmin_Tools.ss

Remove "Filter" title if no search form is present

2015-01-07 16:22:12 +13:00