deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2011-06-04 01:16:08 -05:00
parent 1464e29f4f 0ae83c3560
commit 92e4aaafaf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG
View file

@ -12,12 +12,19 @@ New Features:
* MathJax rendering for non-MathML capable browsers. * MathJax rendering for non-MathML capable browsers.
* RedCloth (Textile) upgraded to 4.x (now handled * RedCloth (Textile) upgraded to 4.x (now handled
by Bundler). by Bundler).
* Bundler upgraded to 1.0.7
* Rails updated to 2.3.11
Bugs Fixed: Bugs Fixed:
* Redirects and categories of included pages should * Redirects and categories of included pages should
not be inherited. (Suggestion of Andrew Stacey). not be inherited. (Suggestion of Andrew Stacey).
* Bug in Maruku equation handling (reported by Andrew Stacey). * Bug in Maruku equation handling (reported by Andrew Stacey).
* SVG-Edit updates and bug-fixes. * 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 * 0.19.1

4
app/controllers/application_controller.rb
View file

@ -277,9 +277,9 @@ module Instiki
module VERSION #:nodoc: module VERSION #:nodoc:
MAJOR = 0 MAJOR = 0
MINOR = 19 MINOR = 19
TINY = 1 TINY = 2
SUFFIX = '(MML+)' SUFFIX = '(MML+)'
PRERELEASE = false PRERELEASE = 'pre'
if PRERELEASE if PRERELEASE
STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
else else