FIX Remove invalid single quote
Merge pull request #876 from cieszak/3.1

FIX Remove invalid single quote
Behat travis tests
MINOR add hook for extensions to update current page id, before falling back to default
Merge pull request #879 from sheadawson/833-currentPageID

Add hook for extensions to update current page id, before falling ...
ContentControllerSearchExtensionTest doesn't clean up after itself.

The problem is FulltextSearchable::enable() does two things:
It enables the extension, as well as sets the MySQL create table option
to MyISAM. Later tests run with the extension enabled, because it doesn't
get removed at the end of the test, but the table type is set back to
InnoDB when the test is reset and schema recreated.

This produces side-effects where later tests in a suite tries to run
ALTER TABLE on File and add fulltext indexes when the table type
is set to InnoDB, causing an error.
Merge pull request #880 from halkyon/fulltextsearch_text

ContentControllerSearchExtensionTest doesn't clean up after itself.
Default CMSMain to Versioned::reading_stage("Stage")

Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
NEW: Page types no longer require a controller, they can inherit the parent page type's

Use ClassInfo::ancestry() instead of get_parent_class()

Fall back to ContentController by default
Merge pull request #881 from kinglozzer/framework-1905-controller-inheritance

NEW: Page types no longer require their own controller (fixes silverstripe/silverstripe-framework#1905)
Behat tests for image upload and overwrite in HTML editor
API JS i18n files with short locale names, generated by build task

The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
Fix comment typo
Merge pull request #887 from trev/patch-1

Fix comment typo
Set default encoding for compass

See https://github.com/silverstripe/silverstripe-framework/pull/2620
Merge pull request #888 from kinglozzer/patch-1

Set default encoding for compass
Merge pull request #884 from chillu/pulls/js-i18n-3.1

API JS i18n files with short locale names, generated by build task
Disable UploadField change detection in assets/admin/add

See https://github.com/silverstripe/silverstripe-framework/issues/2638
Refactor old page redirector into an extension
Merge pull request #801 from ss23/refactor-old-page-redirector

Refactor old page redirector into an extension