Merge branch 'release/2.0.2'

.editorconfig

@@ -0,0 +1,17 @@
+# For more information about the properties used in this file,
+# please see the EditorConfig documentation:
+# http://editorconfig.org
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.yml,package.json}]
+indent_size = 2
+
+# The indent size used in the package.json file cannot be changed:
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
-All Notable changes to `studiobonito/silverstripe-google-analytics` will be documented in this file
+All Notable changes to `studiobonito/silverstripe-google-analytics` will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.2] - 2015-12-17
+### Added
+- Updated module to work with SilverStripe CMS 3.2.
+- Included `.editorconfig` file.
+
 ## [2.0.1] - 2015-09-02
 ### Added
 - Added PHP 7 and PHP 5.3 with lowest dependencies to test suite.
@@ -26,5 +31,6 @@ All Notable changes to `studiobonito/silverstripe-google-analytics` will be docu
 - Added PHPDoc comment for `GoogleAnalyticsSiteConfigExtension->updateCMSFields()`.
 
 [Unreleased]: https://github.com/studiobonito/silverstripe-google-analytics/compare/2.0.1...HEAD
+[2.0.2]: https://github.com/studiobonito/silverstripe-google-analytics/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/studiobonito/silverstripe-google-analytics/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/studiobonito/silverstripe-google-analytics/compare/1.0.0...2.0.0

README.md

@@ -13,7 +13,7 @@ Provide basic Google Analytics integration for SilverStripe CMS.
 
 ## Requirements
 
-- SilverStripe 3.1.2 or newer.
+- SilverStripe CMS 3.1.2 and newer or 3.2 and newer.
 
 ## Install
 
@@ -65,7 +65,7 @@ If you discover any security related issues, please email [email protected]
 
 The BSD-2-Clause License. Please see [License File](LICENSE.md) for more information.
 
-[ico-version]: https://img.shields.io/github/release/studiobonito/silverstripe-google-analytics.svg?style=flat-square
+[ico-version]: https://img.shields.io/packagist/v/studiobonito/silverstripe-google-analytics.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/studiobonito/silverstripe-google-analytics/master.svg?style=flat-square
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/studiobonito/silverstripe-google-analytics.svg?style=flat-square

composer.json

@@ -21,8 +21,8 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "silverstripe/framework": "~3.1.2",
-        "silverstripe/cms": "~3.1.2"
+        "silverstripe/framework": ">=3.1.2,<3.3",
+        "silverstripe/cms": ">=3.1.2,<3.3"
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",