* stable:
Bump versions for v0.10.1 release.
Update the CHANGELOG for the v0.10.1 release.
Fix a broken reference to the extensions tutorial. Closes GH-135.
[Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132.
Fix a failing test case.
[Rails] When configuring the Sass::Plugin, don't overwrite existing template locations. Closes GH-136.
[Command Line] Improved descriptions of the watch and init commands.
[Rails] Improved the next steps to perform after installing compass so that it mentions registering the compass gem.
[Rails] Fixed a reference to the old configuration file.
Add a note to the changelog about uninstalling chriseppstein-compass
Get rid of some dead code that was breaking Rails 3. Closes GH-137.
Conflicts:
VERSION.yml
doc-src/content/CHANGELOG.markdown
frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass
* edge: (118 commits)
Make the tests pass in ruby 1.9
Fix a bug in FSSM for ruby 1.9. Closes GH-48.
Version bump to 0.9.4
Update the TODO.
If a template provides a haml file, it can have compass-enabled sass filters within it.
Allow vendored frameworks to override built-in frameworks to enable
[Rails] Allow compass extensions to be stored in the vendor/plugins/compass/extensions directory.
Fix some issues regarding how the project type configuration gets applied.
Don't leave directories around after testing.
Name all configuration sources for debugging purposes.
[Command Line] Primary commands get special status in the initial help output.
[Command Line] Access the Sass Repl (sass -i) with the compass environment loaded.
Separate the project type default configuration from the installer.
Add config/compass.rb as a known config location. Default to config/compass.rb as the configuration file for rails projects.
Fix a bug when the welcome message was not provided by an extension template.
Version bump to 0.9.3
Starting work on the changelog for 0.10
Stuff that needs to be done before the next release.
Help for each template that ships with compass.
Allow the welcome message to replace the default one instead of just augment it.
...
Conflicts:
CHANGELOG.markdown
VERSION.yml
compass.gemspec
lib/compass/configuration.rb
lib/vendor/fssm.rb
lib/vendor/fssm/state.rb
All images will now be installed using binary mode. Additionally, any file can
be installed in binary mode if the manifest specifies the option :binary => true
for that file.
