Merge branch 'master' into PHRAS-2805_Port_41_facet-case-sensibility

README.md

@@ -63,9 +63,9 @@ The docker distribution come with 3 differents containers :
 
 ## How to build
 
-You can build all the images with the following command at the root directory :
+You can build all the images with the following command at the root directory, choosing an arbirary TAG name :
 
-    ./build <TAG>
+    ./build.sh <TAG>
 
 It will build and tag the following images :
 

docker/phraseanet/auto-install.sh

@@ -2,6 +2,16 @@
 
 set -xe
 
+if [ $INSTALL_ACCOUNT_EMAIL = ""]; then
+    echo "INSTALL_ACCOUNT_EMAIL var is not set."
+    exit 1
+fi
+
+if [ $INSTALL_ACCOUNT_PASSWORD = ""]; then
+    echo "INSTALL_ACCOUNT_PASSWORD var is not set."
+    exit 1
+fi
+
 /var/alchemy/Phraseanet/bin/setup system:install \
     --email=$INSTALL_ACCOUNT_EMAIL \
     --password=$INSTALL_ACCOUNT_PASSWORD \

lib/Alchemy/Phrasea/Cache/RedisCache.php

@@ -73,7 +73,7 @@ class RedisCache extends CacheProvider implements Cache
      */
     protected function doDelete($id)
     {
-        return $this->_redis->delete($id);
+        return $this->_redis->del($id);
     }
 
     /**

lib/Alchemy/Phrasea/Utilities/RedisSessionHandler.php

@@ -80,7 +80,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
      */
     public function destroy($sessionId)
     {
-        return 1 === $this->redis->delete($this->prefix.$sessionId);
+        return 1 === $this->redis->del($this->prefix.$sessionId);
     }
 
     /**

resources/www/common/styles/main.scss

@@ -50,7 +50,9 @@ $mainMenuLinkBackgroundHoverColor: transparent;
   }
 }
 
-
+[class*=" icon-"].fa, [class^=icon-].fa, .fa {
+  font-family: Fontawesome!important;
+}
 [class^="icon-"], [class*=" icon-"].icomoon {
   display: inline-block;
   width: inherit;