From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sat, 23 Jan 2016 16:55:20 +0000 (+0000)
Subject: #fluidbook-website Initialize workspace
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=78c93efc806807f3a59b214c74670a2b42e58cbc;p=fluidbook-v3.git

#fluidbook-website Initialize workspace
Set favicon
@2h
---

diff --git a/desktop.ini b/desktop.ini
index 648ef12..86cf782 100644
--- a/desktop.ini
+++ b/desktop.ini
@@ -1,2 +1,6 @@
 [.ShellClassInfo]
-IconResource=H:\Works\ZendSample\images\favicon\favicon.ico,0
+IconResource=H:\Works\FluidbookWebV3\images\favicon\favicon.ico,0
+[ViewState]
+Mode=
+Vid=
+FolderType=Generic
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index bf75cbc..3fa6ff1 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -8,7 +8,7 @@ bin.mysqldump = /usr/bin/mysqldump
 bin.mysql = /usr/bin/mysql
 bin.zip = /usr/bin/zip
 bin.unzip = /usr/bin/unzip
-;bin.imagemagick=convert
+bin.imagemagick=/usr/bin/convert
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 
@@ -19,7 +19,7 @@ timezone = 'Europe/Paris'
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
 
-webhost = www.
+webhost = www.fluidbook.com
 
 database.adapter = pdo_mysql
 database.params.host = localhost
@@ -27,25 +27,25 @@ database.params.username = fluidbookwebv3
 database.params.password = QsFe2wxVMW
 database.params.dbname = fluidbookwebv3
 
-;former.database.adapter = pdo_mysql
-;former.database.params.host =
-;former.database.params.username =
-;former.database.params.password =
-;former.database.params.dbname =
+former.database.adapter = pdo_mysql
+former.database.params.host = localhost
+former.database.params.username = fluidbook
+former.database.params.password = *arica*2
+former.database.params.dbname = fluidbook_dev
 
-;former.home =
+former.home = /home/fluidbook/www
 
-seo.universalAnalytics =
-seo.google =
-seo.bing =
+seo.universalAnalytics = UA-4339912-2
+seo.google = google93c0129ef18a399d.html
+seo.bing = 8986457D1D126C38A815027C839372DC
 
 navigation.containers[] = 0;
 ;navigation.containers[]=-1;
 navigation.containers[] = -2;
 navigation.containers[] = -3;
 
-locales.fr =
-;locales.en =
+locales.fr = www.fluidbook.com
+locales.en = en.fluidbook.com
 
 
 acl.perpage = true
@@ -62,9 +62,11 @@ dev = true
 
 seo.universalAnalytics =
 
-;httpauth.username = username
-;httpauth.password = password
+httpauth.username = fluidbook
+httpauth.password = fb2016
+httpauth.ip_whitelist[] = 81.57.231.18
+httpauth.ip_whitelist[] = 82.216.164.184
 
 robots = false
 
-webhost = fluidbookwebv3.dev.cubedesigners.com
\ No newline at end of file
+webhost = fluidbook.com
\ No newline at end of file
diff --git a/images/favicon/favicon-ios-114.png b/images/favicon/favicon-ios-114.png
index 341f77c..3b6f34a 100644
Binary files a/images/favicon/favicon-ios-114.png and b/images/favicon/favicon-ios-114.png differ
diff --git a/images/favicon/favicon-ios-120.png b/images/favicon/favicon-ios-120.png
index 0e4c9c4..0b55b56 100644
Binary files a/images/favicon/favicon-ios-120.png and b/images/favicon/favicon-ios-120.png differ
diff --git a/images/favicon/favicon-ios-144.png b/images/favicon/favicon-ios-144.png
index 1fed203..004509e 100644
Binary files a/images/favicon/favicon-ios-144.png and b/images/favicon/favicon-ios-144.png differ
diff --git a/images/favicon/favicon-ios-152.png b/images/favicon/favicon-ios-152.png
index 34c21b6..ebe47dc 100644
Binary files a/images/favicon/favicon-ios-152.png and b/images/favicon/favicon-ios-152.png differ
diff --git a/images/favicon/favicon-ios-57.png b/images/favicon/favicon-ios-57.png
index 9016e3c..c21ca5b 100644
Binary files a/images/favicon/favicon-ios-57.png and b/images/favicon/favicon-ios-57.png differ
diff --git a/images/favicon/favicon-ios-72.png b/images/favicon/favicon-ios-72.png
index 41f38c1..f51cd95 100644
Binary files a/images/favicon/favicon-ios-72.png and b/images/favicon/favicon-ios-72.png differ
diff --git a/images/favicon/favicon-ios-76.png b/images/favicon/favicon-ios-76.png
index abf913e..819a7af 100644
Binary files a/images/favicon/favicon-ios-76.png and b/images/favicon/favicon-ios-76.png differ
diff --git a/images/favicon/favicon.ico b/images/favicon/favicon.ico
index c6f0635..3251f6d 100644
Binary files a/images/favicon/favicon.ico and b/images/favicon/favicon.ico differ
diff --git a/images/favicon/favicon.png b/images/favicon/favicon.png
index f9c9d49..983708a 100644
Binary files a/images/favicon/favicon.png and b/images/favicon/favicon.png differ
diff --git a/index.php b/index.php
index 50535b5..bf7569b 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
 
-if ($_SERVER['HTTP_HOST'] == 'fluidbookwebv3.dev.cubedesigners.com') {
+if ($_SERVER['HTTP_HOST'] == 'dev.fluidbook.com') {
 	define('APPLICATION_ENV', 'testing');
 } else if ($_SERVER['HTTP_HOST'] == 'www.') {
 	define('APPLICATION_ENV', 'production');