Permalink
Commits on Nov 24, 2011
  1. Merge branch 'stable'

    nex3 committed Nov 24, 2011
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/tree/visitors/check_nesting.rb
  2. Don't destructively modify options with force_update.

    nex3 committed Nov 24, 2011
    Closes gh-175
    Closes gh-176
Commits on Nov 23, 2011
  1. Clean up the changelog a little.

    nex3 committed Nov 23, 2011
  2. Merge remote branch 'ChristianPeters/stable_with_moved_updating_style…

    nex3 committed Nov 23, 2011
    …sheet_hook' into stable
    
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
  3. Fix an interpolation parsing bug.

    nex3 committed Nov 23, 2011
    This was reported in the comments of sass/sass#198.
  4. Add a bunch of changelog entries.

    nex3 committed Nov 23, 2011
  5. Don't die if a UTF encoding isn't supported.

    nex3 committed Nov 23, 2011
    Closes gh-199.
  6. Make script_test work standalone.

    nex3 committed Nov 23, 2011
  7. scale-color doesn't take a hue parameter.

    nex3 committed Nov 23, 2011
    Closes gh-203.
  8. Don't set :cache_store in Sass::Plugin::Configuration.

    nex3 committed Nov 23, 2011
    This is set anyway in Engine, so there's no need.
    
    Closes gh-206
  9. Fix terminology in check_nesting.

    nex3 committed Nov 23, 2011
Commits on Oct 7, 2011
  1. Merge branch 'stable'

    nex3 committed Oct 7, 2011
    Conflicts:
    	VERSION
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/scss/parser.rb
  2. Bump VERSION to 3.1.10.

    nex3 committed Oct 7, 2011
Commits on Oct 6, 2011
  1. Merge branch 'stable'

    nex3 committed Oct 6, 2011
    Conflicts:
    	VERSION
    	doc-src/SASS_CHANGELOG.md
  2. Bump VERSION to 3.1.9.

    nex3 committed Oct 6, 2011
Commits on Oct 5, 2011
  1. Merge branch 'stable'

    nex3 committed Oct 5, 2011
    Conflicts:
    	lib/sass/less.rb
  2. Fix broken tests.

    nex3 committed Oct 5, 2011
  3. Merge branch 'stable'

    nex3 committed Oct 5, 2011
    Conflicts:
    	lib/sass/tree/visitors/perform.rb
    	test/sass/engine_test.rb
  4. Deprecate //!.

    nex3 committed Oct 5, 2011
  5. Re-implement comment interpolation.

    nex3 committed Oct 5, 2011
    This makes comment interpolation work similarly to other forms of interpolation.
    The interpolation is parsed at parse-time, using the standard
    interpolation-parsing functions.
    
    Closes gh-185
Commits on Oct 4, 2011
  1. Merge branch 'stable'

    nex3 committed Oct 4, 2011
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
  2. Fix + combinator.

    nex3 committed Oct 4, 2011
    Closes gh-182
Commits on Oct 3, 2011
  1. Merge branch 'stable' of https://github.com/nex3/sass into stable_wit…

    ChristianPeters committed Oct 3, 2011
    …h_moved_updating_stylesheet_hook
    
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
Commits on Oct 2, 2011
Commits on Oct 1, 2011
Commits on Sep 30, 2011
  1. Change logger_test permissions.

    nex3 committed Sep 30, 2011