Updates for 3.1.4 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15235 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f2770a48291738f490fdd8fe879f892b6757c3f7..e92c77dc28c4f4c69a79a17b8aca0bbeefabfbb0 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,13 +4,38 @@ Redmine - project management software
 Copyright (C) 2006-2015  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2016-03-13 v3.1.4
+
+* Defect #21588: Simplified Chinese "field_cvs_module" translation has problem (Patch #21430)
+* Defect #21656: Fix Non ASCII attachment filename encoding broken (MOJIBAKE) in Microsoft Edge Explorer
+* Defect #22072: Private notes get copied without private flag to Duplicate issues
+* Defect #22127: Issues can be assigned to any user
+* Defect #21219: Date pickers images for start/due date fields are not shown for issues with subtasks
+* Defect #21477: Assign to "Anonymous" doesn't make much sense
+* Defect #21488: Don't use past start date as default due date in the date picker
+* Defect #21504: IssuePriority.position_name not recalculated every time it should
+* Defect #21551: Private note flag disappears in issue update conflict
+* Defect #21843: Nokogiri security issue
+* Defect #21900: Moving a page with a child raises an error if target wiki contains a page with the same name as the child
+* Patch #21650: Simplified Chinese translation of wiki formating for 2.6-stable
+* Patch #21881: Russian wiki translation for 2.6-stable
+* Patch #21898: Catalan wiki translation for 2.6-stable
+* Patch #21456: Simplified Chinese translation of wiki formating for 3.1-stable
+* Patch #21686: Russian translation for 3.1-stable
+* Patch #21687: German translations for 3.1-stable
+* Patch #21689: Turkish translation for 3.1-stable
+* Patch #21882: Russian wiki translation for 3.1-stable
+* Patch #21899: Catalan wiki translation for 3.1-stable
+* Patch #22131: German translations for 3.1-stable
+* Patch #22139: Japanese wiki syntax (Markdown) translation for 3.1-stable
+
 == 2015-12-05 v3.1.3
 
-Defect #16948: Broken anonymous repository access for public projects with Apache 2.4 (redmine.pm)
-Defect #21328: pdf: Vietnamese Italic is not shown
-Defect #21419: Information leak in Atom feed
-Patch #21312: Fix exception in Redmine.pm when authenticating anonymous users
-Patch #21430: Simplified Chinese translation
+* Defect #16948: Broken anonymous repository access for public projects with Apache 2.4 (redmine.pm)
+* Defect #21328: pdf: Vietnamese Italic is not shown
+* Defect #21419: Information leak in Atom feed
+* Patch #21312: Fix exception in Redmine.pm when authenticating anonymous users
+* Patch #21430: Simplified Chinese translation
 
 == 2015-11-14 v3.1.2
 

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 150cce5bd5d5679f1fdf5d2ffb691afe511c5645..c2a47ac6e3e4336c398672ced8a9573d1b54d77e 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     # Branch values:
     # * official release: nil