Merge branch 'release/1.18' into develop

* release/1.18: Update changelog Bump version to v1.18
canton7 · Jul 24, 2012 · 44dba22 · 44dba22
2 parents 449930f + 9b8b915
commit 44dba22
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -4,7 +4,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2012 Antony Male

diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,10 @@ Changelog
 
 This file lists the important changes between versions. For a list of minor changes, check the log.
 
+v1.18
+-----
+ - Add a new CSS URI rewriting algorithm ('relative'), which should fix the problems with using the (original) absolute rewriting with a symlinked docroot.
+
 v1.17
 -----
  - `js_inline` and `css_inline` won't spit out lots of consecutive tags.

diff --git a/classes/casset.php b/classes/casset.php
@@ -4,7 +4,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2012 Antony Male

diff --git a/classes/casset/addons/twig.php b/classes/casset/addons/twig.php
@@ -4,7 +4,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @author     Derek Myers
  * @license    MIT License

diff --git a/classes/casset/csscompressor.php b/classes/casset/csscompressor.php
@@ -17,7 +17,7 @@
  * This library is used as part of Casset.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/classes/casset/cssurirewriter.php b/classes/casset/cssurirewriter.php
@@ -10,7 +10,7 @@
  * This library is used as part of Casset.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/classes/casset/cssurirewriterrelative.php b/classes/casset/cssurirewriterrelative.php
@@ -4,7 +4,7 @@
  * This library is used as part of Casset.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/classes/casset/jsmin.php b/classes/casset/jsmin.php
@@ -52,7 +52,7 @@
 /**
  * This library is used as part of Casset.
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/config/casset.php b/config/casset.php
@@ -3,7 +3,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.17
+ * @version    v1.18
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2012 Antony Male