diff --git a/History.md b/History.md index b4517e91..e148af99 100644 --- a/History.md +++ b/History.md @@ -1,9 +1,6 @@ # Liquid Version History -IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability. -The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8. - -## 2.6.0 / Master branch (not yet released) +## 3.0.0 / not yet released / branch "master" * ... * Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume] @@ -11,8 +8,13 @@ The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are * Make sort filter work on enumerable drops, see #239 [Florian Weingarten, fw42] * Fix clashing method names in enumerable drops, see #238 [Florian Weingarten, fw42] * Make map filter work on enumerable drops, see #233 [Florian Weingarten, fw42] -* Fix security issue with map filter, see #230, #232, #234, #237 [Florian Weingarten, fw42] * Improved whitespace stripping for blank blocks, related to #216 [Florian Weingarten, fw42] + +## 2.6.0 / not yet released / branch "2.6-stable" + +IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability. +The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8. + * Bugfix for #106: fix example servlet [gnowoel] * Bugfix for #97: strip_html filter supports multi-line tags [Jo Liss, joliss] * Bugfix for #114: strip_html filter supports style tags [James Allardice, jamesallardice] @@ -31,6 +33,17 @@ The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are * Better documentation for 'include' tag (closes #163) [Peter Schröder, phoet] * Use of BigDecimal on filters to have better precision (closes #155) [Arthur Nogueira Neves, arthurnn] +## 2.5.3 / 2013-10-09 / branch "2.5-stable" + +* #232, #234, #237: Fix map filter bugs [Florian Weingarten, fw42] + +## 2.5.2 / 2013-09-03 / deleted + +Yanked from rubygems, as it contained too many changes that broke compatibility. Those changes will be on following major releases. + +## 2.5.1 / 2013-07-24 + +* #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten, fw42] ## 2.5.0 / 2013-03-06