Damian Mooyman afc9bb0dc6 Merge 3.3 into 3.4 ...

# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml

2016-08-05 16:46:35 +12:00

..

lang

Merge 3.3 into 3.4

2016-08-05 16:46:35 +12:00

AssetAdmin.DragDrop.js

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

AssetAdmin.js

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

CMSMain.AddForm.js

Merge remote-tracking branch 'origin/3.3' into 3

2016-01-25 15:58:35 +13:00

CMSMain.EditForm.js

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

CMSMain.js

Add three column layout to Page content view

2015-07-02 10:23:37 +12:00

CMSMain.Tree.js

Update the filtered tree styling

2015-08-25 13:02:20 +12:00

CMSPageHistoryController.js

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

RedirectorPage.js

FIX: RedirectorPage toggles not working (fixes #1328)

2015-11-17 16:22:49 +00:00

SilverStripeNavigator.js

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

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

SiteTreeURLSegmentField.js

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00