Permalink
Commits on Oct 15, 2015
  1. use * for consistency

    kriswallsmith committed Oct 15, 2015
  2. Merge pull request #761 from thetiby/clean-css-filter

    Added CleanCss 3.4.5 filter support
    kriswallsmith committed Oct 15, 2015
Commits on Oct 12, 2015
Commits on Oct 1, 2015
  1. Update the branch alias

    stof committed Oct 1, 2015
  2. Merge pull request #704 from lduer/master

    added options for LessphpFilter
    kriswallsmith committed Oct 1, 2015
Commits on Aug 31, 2015
  1. Merge pull request #754 from stof/fix_twig_2

    Fix the compatibility with Twig 2
    stof committed Aug 31, 2015
  2. Fix the compatibility with Twig 2

    stof committed Aug 31, 2015
Commits on Aug 29, 2015
  1. Merge pull request #751 from stof/twig_2

    Make the Twig integration compatible with Twig 2.0
    stof committed Aug 29, 2015
Commits on Aug 20, 2015
  1. Merge pull request #750 from stof/travis_improvements

    Improve the CI setup
    stof committed Aug 20, 2015
  2. Fix lowest bounds for constraints

    stof committed Aug 20, 2015
  3. Improve the CI setup

    - use the faster container-based infrastructure on Travis
    - persist the composer cache between builds
    - use stable dependencies by default (a job is kept running dev
      versions)
    - test against lowest composer dependencies
    - add testing on PHP 7
    stof committed Aug 20, 2015
Commits on Aug 19, 2015
  1. bug #723 ScssphpFilter - do not add empty load path as import path (a…

    …aukt)
    
    This PR was merged into the 1.3-dev branch.
    
    Discussion
    ----------
    
    ScssphpFilter - do not add empty load path as import path
    
    This has in part to do with #164 and in part with leafo/scssphp#237.
    
    When you iterate in https://github.com/kriswallsmith/assetic/blob/master/src/Assetic/Factory/AssetFactory.php#L254 over a AssetReference that references a AssetCollection the call to getSourceDirectory() in https://github.com/kriswallsmith/assetic/blob/master/src/Assetic/Factory/AssetFactory.php#L277 would return nothing (null).
    
    The ScssphpFilter would then call addImportPath() on the scss compiler with null which results in an exception "call_user_func() expects parameter 1 to be a valid callback, no array or string given", which would in turn keep imports from being parsed and replaced properly
    
    Commits
    -------
    
    ae950df ScssphpFilter - do not add empty load path as import path
    stof committed Aug 19, 2015
  2. minor #725 update copyright date to 2015 (chadburrus)

    This PR was merged into the 1.3-dev branch.
    
    Discussion
    ----------
    
    update copyright date to 2015
    
    Commits
    -------
    
    8cbe8b2 update copyright date to 2015
    stof committed Aug 19, 2015
Commits on Aug 5, 2015
  1. Merge branch '1.2.x'

    stof committed Aug 5, 2015
  2. Fix ScssPHP tests

    stof committed Aug 5, 2015
  3. Merge branch '1.1.x' into 1.2.x

    Conflicts:
    	tests/Assetic/Test/Filter/StylusFilterTest.php
    stof committed Aug 5, 2015
  4. Fix the UglifyCssFilter tests

    The filter generates assets with a final EOL now.
    stof committed Aug 5, 2015
  5. Merge branch '1.0.x' into 1.1.x

    stof committed Aug 5, 2015
Commits on Jul 8, 2015
  1. Merge pull request #743 from bloveless/feature-add-separator-filter-t…

    …o-readme
    
    Add comment about SeparatorFilter to the Readme file
    kriswallsmith committed Jul 8, 2015
Commits on Jun 16, 2015
  1. Merge pull request #567 from robertfausk/master

    use cacheLocation for all temp files (concerning compass)
    kriswallsmith committed Jun 16, 2015
Commits on Mar 26, 2015
  1. update copyright date to 2015

    chadburrus committed Mar 26, 2015
Commits on Mar 19, 2015
  1. Merge remote-tracking branch 'kriswallsmith/assetic/master'

    Conflicts:
    	src/Assetic/Filter/CompassFilter.php
    robertfausk committed Mar 19, 2015
Commits on Mar 2, 2015
  1. Merge pull request #682 from Xenopathic/master

    Add filter to append separator to assets
    kriswallsmith committed Mar 2, 2015
Commits on Feb 9, 2015
  1. added filesystem utils

    kriswallsmith committed Feb 9, 2015
Commits on Feb 8, 2015