Merged r16532.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0e70699e3c65cf4e56e3e22f3aaee9e48ba7b2c2..7fea1e7df75f89577b3f8c0b3aa4eb69b92ebf23 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,32 @@ Redmine - project management software
 Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2017-04-09 v3.3.3
+
+Defect #22335: Images with non-ASCII file names are not shown in PDF
+Defect #24271: htmlentities warning
+Defect #24869: Circular inclusion detected when including a wiki page with the same name
+Defect #24875: Issues API does not respect time_entries_visibility
+Defect #24999: Mercurial 4.1 compatibility
+Defect #25371: Git 2.9 compatibility
+Defect #25478: Related to "no open issues" shows all issues
+Defect #25501: Time entries query through multiple projects by issue custom field not possible anymore
+Patch #20661: Show visible spent time link for users allowed to view time entries.
+Patch #24778: Czech localisation for 3.3-stable
+Patch #24824: Traditional Chinese translation (to r16179)
+Patch #24885: Japanese translation for 3.3-stable
+Patch #24948: Bulgarian translation for 3.3-stable
+Patch #25459: Portuguese translation for 3.3-stable
+Patch #25502: Russian translation for 3.3-stable
+Patch #25115: Support upload of empty files and fix invalid API response
+Patch #25526: Revert API change in spent_hours field in issue#show
+Defect #23793: Information leak when rendering of Wiki links
+Defect #23803: Information leak when rendering Time Entry activities
+Defect #24199: Stored XSS with SVG attachments
+Defect #24307: Redmine.pm doesn't check that the repository module is enabled on project
+Defect #24416: Use redirect to prevent password reset tokens in referers
+Defect #25503: Improper markup sanitization in user content
+
 == 2017-01-07 v3.3.2
 
 * Defect #13622: "Clear" button in Spent Time Report tab also clears global filters

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