From 8f2fac4c2bac5a377d59b03fb60737687eaf03b1 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 4 Feb 2016 18:05:27 +1300
Subject: [PATCH] Update changelog for 3.1.1 release

---
 changelog.md | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/changelog.md b/changelog.md
index 8e09202ed..d217dd214 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,22 +4,17 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.0.0]
-
-* Changelog added.
-
-## [3.0.1]
-
-* Made userforms a supported module
-* Fix code coverage
-* Update documentation to include requirements
-* Fix DisplayRule versioning
-* Fix duplication of forms with groups
-
-## [3.0.2]
+## [3.1.1]
+
+* Added standard editor config
+* Added standard code of conduct
+* Add placeholder to Numeric and Email fields
+* Updated license year
+* Fix call log() function on instance of UserFormsUpgradeService
+* Minor:fixed userforms class name specificity
+* Update translations
+* Remove redundant file
 
- * Fix Casting to integer to prevent potential SQL injection.
- 
 ## [3.1.0]
 
 * Add 3.0.3 changelog
@@ -32,4 +27,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects
 * adding some spaces for better readability
 * Making requirements clearer
-* Add 3.0.2 changelog
\ No newline at end of file
+* Add 3.0.2 changelog
+
+## [3.0.2]
+
+ * Fix Casting to integer to prevent potential SQL injection.
+
+## [3.0.1]
+
+* Made userforms a supported module
+* Fix code coverage
+* Update documentation to include requirements
+* Fix DisplayRule versioning
+* Fix duplication of forms with groups
+
+## [3.0.0]
+
+* Changelog added.