mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
Conflicts: VERSION
This commit is contained in:
Nathan Weizenbaum
commit
a7bb39624c
4 changed files with 114 additions and 39 deletions
|
|
@ -190,6 +190,9 @@ that surrounds the filtered text with `<style>` and CDATA tags.
|
|||
|
||||
## 2.2.18 (Unreleased)
|
||||
|
||||
* Support [the new XSS-protection API](http://yehudakatz.com/2010/02/01/safebuffers-and-rails-3-0/)
|
||||
used in Rails 3.
|
||||
|
||||
* Use `Rails.env` rather than `RAILS_ENV` when running under Rails 3.0.
|
||||
Thanks to [Duncan Grazier](http://duncangrazier.com/).
|
||||
|
||||
|
|
@ -202,21 +205,27 @@ that surrounds the filtered text with `<style>` and CDATA tags.
|
|||
|
||||
* Fix a parsing bug for HTML-style attributes including `#`.
|
||||
|
||||
## [2.2.17](http://github.com/nex3/haml/commit/2.2.16)
|
||||
## 2.2.17
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.17).
|
||||
|
||||
* Fix compilation of HTML5 doctypes when using `html2haml`.
|
||||
|
||||
* `nil` values for Sass options are now ignored,
|
||||
rather than raising errors.
|
||||
|
||||
## [2.2.16](http://github.com/nex3/haml/commit/2.2.16)
|
||||
## 2.2.16
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.16).
|
||||
|
||||
* Abstract out references to `ActionView::TemplateError`,
|
||||
`ActionView::TemplateHandler`, etc.
|
||||
These have all been renamed to `ActionView::Template::*`
|
||||
in Rails 3.0.
|
||||
|
||||
## [2.2.15](http://github.com/nex3/haml/commit/2.2.15)
|
||||
## 2.2.15
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.15).
|
||||
|
||||
* Allow `if` statements with no content followed by `else` clauses.
|
||||
For example:
|
||||
|
|
@ -225,7 +234,9 @@ that surrounds the filtered text with `<style>` and CDATA tags.
|
|||
- else
|
||||
bar
|
||||
|
||||
## [2.2.14](http://github.com/nex3/haml/commit/2.2.14)
|
||||
## 2.2.14
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.14).
|
||||
|
||||
* Don't print warnings when escaping attributes containing non-ASCII characters
|
||||
in Ruby 1.9.
|
||||
|
|
@ -235,7 +246,9 @@ that surrounds the filtered text with `<style>` and CDATA tags.
|
|||
* Support the HTML5 doctype in an XHTML document
|
||||
by using `!!! 5` as the doctype declaration.
|
||||
|
||||
## [2.2.13](http://github.com/nex3/haml/commit/2.2.13)
|
||||
## 2.2.13
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.13).
|
||||
|
||||
* Allow users to specify {file:HAML_REFERENCE.md#encoding_option `:encoding => "ascii-8bit"`}
|
||||
even for templates that include non-ASCII byte sequences.
|
||||
|
|
@ -244,11 +257,15 @@ that surrounds the filtered text with `<style>` and CDATA tags.
|
|||
|
||||
* Fixed an incompatibility with Hpricot 0.8.2, which is used for `html2haml`.
|
||||
|
||||
## [2.2.12](http://github.com/nex3/haml/commit/2.2.12)
|
||||
## 2.2.12
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.12).
|
||||
|
||||
There were no changes made to Haml between versions 2.2.11 and 2.2.12.
|
||||
|
||||
## [2.2.11](http://github.com/nex3/haml/commit/2.2.11)
|
||||
## 2.2.11
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.11).
|
||||
|
||||
* Fixed a bug with XSS protection where HTML escaping would raise an error
|
||||
if passed a non-string value.
|
||||
|
|
@ -273,7 +290,9 @@ There were no changes made to Haml between versions 2.2.11 and 2.2.12.
|
|||
Instead abstract this out as `Haml::Util.rails_root`.
|
||||
This changes makes Haml fully compatible with edge Rails as of this writing.
|
||||
|
||||
## [2.2.10](http://github.com/nex3/haml/commit/2.2.10)
|
||||
## 2.2.10
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.10).
|
||||
|
||||
* Fixed a bug where elements with dynamic attributes and no content
|
||||
would have too much whitespace between the opening and closing tag.
|
||||
|
|
@ -290,7 +309,9 @@ There were no changes made to Haml between versions 2.2.11 and 2.2.12.
|
|||
* Mark the return value of Haml templates as HTML safe.
|
||||
This makes Haml partials work with Rails' XSS protection.
|
||||
|
||||
## [2.2.9](http://github.com/nex3/haml/commit/2.2.9)
|
||||
## 2.2.9
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.9).
|
||||
|
||||
* Fixed a bug where Haml's text was concatenated to the wrong buffer
|
||||
under certain circumstances.
|
||||
|
|
@ -324,12 +345,16 @@ There are several components to this:
|
|||
* Haml helpers that generate HTML are marked as HTML safe,
|
||||
and will escape their input if it's not HTML safe.
|
||||
|
||||
## [2.2.8](http://github.com/nex3/haml/commit/2.2.8)
|
||||
## 2.2.8
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.8).
|
||||
|
||||
* Fixed a potential XSS issue with HTML escaping and wacky Unicode nonsense.
|
||||
This is the same as [the issue fixed in Rails](http://groups.google.com/group/rubyonrails-security/browse_thread/thread/48ab3f4a2c16190f) a bit ago.
|
||||
|
||||
## [2.2.7](http://github.com/nex3/haml/commit/2.2.7)
|
||||
## 2.2.7
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.7).
|
||||
|
||||
* Fixed an `html2haml` issue where ERB attribute values
|
||||
weren't HTML-unescaped before being transformed into Haml.
|
||||
|
|
@ -347,7 +372,9 @@ There are several components to this:
|
|||
The `else` et al. clauses of conditionals are now properly
|
||||
whitespace-nuked.
|
||||
|
||||
## [2.2.6](http://github.com/nex3/haml/commit/2.2.6)
|
||||
## 2.2.6
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.6).
|
||||
|
||||
* Made the error message when unable to load a dependency for html2haml
|
||||
respect the `--trace` option.
|
||||
|
|
@ -361,7 +388,9 @@ There are several components to this:
|
|||
* Raise an exception when commas are omitted in static attributes
|
||||
(e.g. `%p{:foo => "bar" :baz => "bang"}`).
|
||||
|
||||
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
|
||||
## 2.2.5
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.5).
|
||||
|
||||
* Got rid of trailing whitespace produced when opening a conditional comment
|
||||
(thanks to [Norman Clarke](http://blog.njclarke.com/)).
|
||||
|
|
@ -371,7 +400,9 @@ There are several components to this:
|
|||
|
||||
* Fixed a couple bugs with using "-end" in strings.
|
||||
|
||||
## [2.2.4](http://github.com/nex3/haml/commit/2.2.4)
|
||||
## 2.2.4
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.4).
|
||||
|
||||
* Allow `end` to be used for silent script when it's followed by code.
|
||||
For example:
|
||||
|
|
@ -386,12 +417,16 @@ There are several components to this:
|
|||
via `haml --rails`. This isn't necessary, and actually gets
|
||||
clobbered as soon as haml/template is loaded.
|
||||
|
||||
## [2.2.3](http://github.com/nex3/haml/commit/2.2.3)
|
||||
## 2.2.3
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.3).
|
||||
|
||||
Haml 2.2.3 adds support for the JRuby bundling tools
|
||||
for Google AppEngine, thanks to [Jan Ulbrich](http://github.com/ulbrich).
|
||||
|
||||
## [2.2.2](http://github.com/nex3/haml/commit/2.2.2)
|
||||
## 2.2.2
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.2).
|
||||
|
||||
Haml 2.2.2 is a minor bugfix release, with several notable changes.
|
||||
First, {file:Haml/Helpers.html#haml_concat-instance_method `haml_concat`}
|
||||
|
|
@ -404,11 +439,15 @@ especially with the {file:HAML_REFERENCE.md#htmlstyle_attributes_ new attribute
|
|||
Third, filters are no longer escaped when the {file:HAML_REFERENCE.md#escape_html-option `:escape_html` option}
|
||||
is enabled and `#{}` interpolation is used.
|
||||
|
||||
## [2.2.1](http://github.com/nex3/haml/commit/2.2.1)
|
||||
## 2.2.1
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.1).
|
||||
|
||||
Haml 2.2.1 is a minor bug-fix release.
|
||||
|
||||
## [2.2.0](http://github.com/nex3/haml/commit/2.2.0)
|
||||
## 2.2.0
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.0).
|
||||
|
||||
Haml 2.2 adds several new features to the language,
|
||||
fixes several bugs, and dramatically improves performance
|
||||
|
|
|
|||
|
|
@ -233,7 +233,9 @@ Several bug fixes and minor improvements have been made, including:
|
|||
just like comments elsewhere.
|
||||
Similarly, comment parsing is a little nicer than before.
|
||||
|
||||
## [2.2.17](http://github.com/nex3/haml/commit/2.2.16)
|
||||
## 2.2.17
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.16).
|
||||
|
||||
* When the {file:SASS_REFERENCE.md#full_exception-option `:full_exception` option}
|
||||
is false, raise the error in Ruby code rather than swallowing it
|
||||
|
|
@ -261,7 +263,9 @@ Several bug fixes and minor improvements have been made, including:
|
|||
In future versions, `@import foo` will either import the template
|
||||
or raise an error.
|
||||
|
||||
## [2.2.16](http://github.com/nex3/haml/commit/2.2.16)
|
||||
## 2.2.16
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.16).
|
||||
|
||||
* Fixed a bug where modules containing user-defined Sass functions
|
||||
weren't made available when simply included in {Sass::Script::Functions}
|
||||
|
|
@ -269,7 +273,9 @@ Several bug fixes and minor improvements have been made, including:
|
|||
{Sass::Script::Functions::EvaluationContext Functions::EvaluationContext}).
|
||||
Now the module simply needs to be included in {Sass::Script::Functions}.
|
||||
|
||||
## [2.2.15](http://github.com/nex3/haml/commit/2.2.15)
|
||||
## 2.2.15
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.15).
|
||||
|
||||
* Added {Sass::Script::Color#with} for a way of setting color channels
|
||||
that's easier than manually constructing a new color
|
||||
|
|
@ -279,7 +285,9 @@ Several bug fixes and minor improvements have been made, including:
|
|||
* Added a missing require in Sass that caused crashes
|
||||
when it was being run standalone.
|
||||
|
||||
## [2.2.14](http://github.com/nex3/haml/commit/2.2.14)
|
||||
## 2.2.14
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.14).
|
||||
|
||||
* All Sass functions now raise explicit errors if their inputs
|
||||
are of the incorrect type.
|
||||
|
|
@ -314,15 +322,21 @@ To activate this, just add
|
|||
to your `config.ru`.
|
||||
See the {Sass::Plugin::Rack} documentation for more details.
|
||||
|
||||
## [2.2.13](http://github.com/nex3/haml/commit/2.2.13)
|
||||
## 2.2.13
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.13).
|
||||
|
||||
There were no changes made to Sass between versions 2.2.12 and 2.2.13.
|
||||
|
||||
## [2.2.12](http://github.com/nex3/haml/commit/2.2.12)
|
||||
## 2.2.12
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.12).
|
||||
|
||||
* Fix a stupid bug introduced in 2.2.11 that broke the Sass Rails plugin.
|
||||
|
||||
## [2.2.11](http://github.com/nex3/haml/commit/2.2.11)
|
||||
## 2.2.11
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.11).
|
||||
|
||||
* Added a note to errors on properties that could be pseudo-classes (e.g. `:focus`)
|
||||
indicating that they should be backslash-escaped.
|
||||
|
|
@ -343,7 +357,9 @@ There were no changes made to Sass between versions 2.2.12 and 2.2.13.
|
|||
* Make use of a Rails callback rather than a monkeypatch to check for stylesheet updates
|
||||
in Rails 3.0+.
|
||||
|
||||
## [2.2.10](http://github.com/nex3/haml/commit/2.2.10)
|
||||
## 2.2.10
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.10).
|
||||
|
||||
* Add support for attribute selectors with spaces around the `=`.
|
||||
For example:
|
||||
|
|
@ -351,19 +367,27 @@ There were no changes made to Sass between versions 2.2.12 and 2.2.13.
|
|||
a[href = http://google.com]
|
||||
color: blue
|
||||
|
||||
## [2.2.9](http://github.com/nex3/haml/commit/2.2.9)
|
||||
## 2.2.9
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.9).
|
||||
|
||||
There were no changes made to Sass between versions 2.2.8 and 2.2.9.
|
||||
|
||||
## [2.2.8](http://github.com/nex3/haml/commit/2.2.8)
|
||||
## 2.2.8
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.8).
|
||||
|
||||
There were no changes made to Sass between versions 2.2.7 and 2.2.8.
|
||||
|
||||
## [2.2.7](http://github.com/nex3/haml/commit/2.2.7)
|
||||
## 2.2.7
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.7).
|
||||
|
||||
There were no changes made to Sass between versions 2.2.6 and 2.2.7.
|
||||
|
||||
## [2.2.6](http://github.com/nex3/haml/commit/2.2.6)
|
||||
## 2.2.6
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.6).
|
||||
|
||||
* Don't crash when the `__FILE__` constant of a Ruby file is a relative path,
|
||||
as apparently happens sometimes in TextMate
|
||||
|
|
@ -371,11 +395,15 @@ There were no changes made to Sass between versions 2.2.6 and 2.2.7.
|
|||
|
||||
* Add "Sass" to the `--version` string for the executables.
|
||||
|
||||
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
|
||||
## 2.2.5
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.5).
|
||||
|
||||
There were no changes made to Sass between versions 2.2.4 and 2.2.5.
|
||||
|
||||
## [2.2.4](http://github.com/nex3/haml/commit/2.2.4)
|
||||
## 2.2.4
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.4).
|
||||
|
||||
* Don't add `require 'rubygems'` to the top of init.rb when installed
|
||||
via `sass --rails`. This isn't necessary, and actually gets
|
||||
|
|
@ -384,18 +412,24 @@ There were no changes made to Sass between versions 2.2.4 and 2.2.5.
|
|||
* Document the previously-undocumented {file:SASS_REFERENCE.md#line-option `:line` option},
|
||||
which allows the number of the first line of a Sass file to be set for error reporting.
|
||||
|
||||
## [2.2.3](http://github.com/nex3/haml/commit/2.2.3)
|
||||
## 2.2.3
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.3).
|
||||
|
||||
Sass 2.2.3 prints line numbers for warnings about selectors
|
||||
with no properties.
|
||||
|
||||
## [2.2.2](http://github.com/nex3/haml/commit/2.2.2)
|
||||
## 2.2.2
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.2).
|
||||
|
||||
Sass 2.2.2 is a minor bug-fix release.
|
||||
Notable changes include better parsing of mixin definitions and inclusions
|
||||
and better support for Ruby 1.9.
|
||||
|
||||
## [2.2.1](http://github.com/nex3/haml/commit/2.2.1)
|
||||
## 2.2.1
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.1).
|
||||
|
||||
Sass 2.2.1 is a minor bug-fix release.
|
||||
|
||||
|
|
@ -406,7 +440,9 @@ Sass 2.2.1 is a minor bug-fix release.
|
|||
This is now deprecated, so that in the future variables with hyphens
|
||||
can be supported. Surround `-` with spaces.
|
||||
|
||||
## [2.2.0](http://github.com/nex3/haml/commit/2.2.0)
|
||||
## 2.2.0
|
||||
|
||||
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.0).
|
||||
|
||||
The 2.2 release marks a significant step in the evolution of the Sass
|
||||
language. The focus has been to increase the power of Sass to keep
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
;; Author: Nathan Weizenbaum
|
||||
;; URL: http://github.com/nex3/haml/tree/master
|
||||
;; Version: 2.2.7
|
||||
;; Version: 2.2.18
|
||||
;; Created: 2007-03-08
|
||||
;; By: Nathan Weizenbaum
|
||||
;; Keywords: markup, language, html
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
;; Author: Nathan Weizenbaum
|
||||
;; URL: http://github.com/nex3/haml/tree/master
|
||||
;; Version: 2.2.7
|
||||
;; Version: 2.2.18
|
||||
;; Created: 2007-03-15
|
||||
;; By: Nathan Weizenbaum
|
||||
;; Keywords: markup, language, css
|
||||
;; Package-Requires: ((haml-mode "2.2.7"))
|
||||
;; Package-Requires: ((haml-mode "2.2.18"))
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue