Ingo Schommer 0a1ffd3e1a Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml

2013-10-20 13:51:19 +02:00

..

lang

FIX Remove invalid single quote

2013-10-16 00:06:41 +02:00

AssetAdmin.DragDrop.js

BUGFIX Adding missing onunmatch in AssetAdmin.DragDrop

2012-05-23 16:09:08 +12:00

AssetAdmin.js

BUGFIX: Disable javascript not used right now because assets don't have batch actions. (Trac #7367)

2012-06-15 15:50:11 +12:00

CMSMain.AddForm.js

"add page" behaviour fixed to work with new FormField IDs (#786)

2013-08-28 11:10:32 +02:00

CMSMain.EditForm.js

Stop MenuTitle updating tree on change

2013-10-02 12:53:03 +02:00

CMSMain.js

API CHANGE Combined "Pages" and "Edit Page" into a single menu entry

2012-04-17 22:59:08 +02:00

CMSMain.Tree.js

Calculate where to scroll to based off the position in the div

2013-10-10 15:42:49 +13:00

CMSPageHistoryController.js

BUG ShowUnpublished checkbox with initial state not working

2013-05-13 16:24:00 +12:00

RedirectorPage.js

BUGFIX: add missing onunmatches causing exceptions in entwine

2012-05-18 14:33:17 +12:00

SilverStripeNavigator.js

NEW Side by side editing functionality - first cut (os#7412)

2012-12-10 18:09:54 +01:00

SiteTreeURLSegmentField.js

Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570)

2013-04-05 14:06:32 +01:00