diff --git a/CHANGELOG b/CHANGELOG index 0749b4ca..a2557917 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,12 +12,19 @@ New Features: * MathJax rendering for non-MathML capable browsers. * RedCloth (Textile) upgraded to 4.x (now handled by Bundler). +* Bundler upgraded to 1.0.7 +* Rails updated to 2.3.11 Bugs Fixed: * Redirects and categories of included pages should not be inherited. (Suggestion of Andrew Stacey). * Bug in Maruku equation handling (reported by Andrew Stacey). * SVG-Edit updates and bug-fixes. +* Bug in editing S5 slideshows. +* Unvendor Rack +* Fix Maruku list-parsing bug (reported by Shamaoke) +* Validate Web address (Reported by Richard Marquez). +* Fix a well-formedness bug ------------------------------------------------------------------------------ * 0.19.1 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0bd1504d..afd47ec8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -277,9 +277,9 @@ module Instiki module VERSION #:nodoc: MAJOR = 0 MINOR = 19 - TINY = 1 + TINY = 2 SUFFIX = '(MML+)' - PRERELEASE = false + PRERELEASE = 'pre' if PRERELEASE STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX else