Merge branch 'admin' of https://github.com/thelia/thelia into admin

Conflicts:
	core/lib/Thelia/Admin/Templating/Template.class.php

.gitignore

@@ -16,3 +16,4 @@ coverage
 .settings/
 local/cache/*
 composer.lock
+web/assets/*

core/lib/Thelia/Admin/Templating/Template.php

@@ -41,6 +41,7 @@ class Template extends Smarty
         if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true);
 
         $web_root  = THELIA_WEB_DIR;
+
         $asset_dir_from_web_root = 'assets/admin/default'; // FIXME
 
         $this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root);

web/.htaccess

@@ -5,6 +5,8 @@ AddDefaultCharset UTF-8
 <IfModule mod_rewrite.c>
 	RewriteEngine on
 
-	RewriteBase /thelia2
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>