Merge remote-tracking branch 'origin/3.7' into 3.8

a462cd23 · Laurent Destailleur · 9e2a0562 · 4a88c9ea · a462cd23 · a462cd23
Commit a462cd23 authored 9 years ago by Laurent Destailleur
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
--- a/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
+++ b/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
--- a/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
+++ b/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
--- a/htdocs/includes/jquery/plugins/tiptip/tipTip.css
+++ b/htdocs/includes/jquery/plugins/tiptip/tipTip.css
--- a/htdocs/install/doctemplates/projects/template_project.odt
+++ b/htdocs/install/doctemplates/projects/template_project.odt
--- a/htdocs/install/mysql/data/llx_c_input_method.sql
+++ b/htdocs/install/mysql/data/llx_c_input_method.sql
--- a/htdocs/install/mysql/data/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/data/llx_c_input_reason.sql
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
--- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
--- a/htdocs/install/mysql/tables/llx_resource.key.sql
+++ b/htdocs/install/mysql/tables/llx_resource.key.sql
--- a/htdocs/opensurvey/img/accept-24.png
+++ b/htdocs/opensurvey/img/accept-24.png
--- a/htdocs/opensurvey/img/accept.png
+++ b/htdocs/opensurvey/img/accept.png
--- a/htdocs/opensurvey/img/add-16.png
+++ b/htdocs/opensurvey/img/add-16.png
--- a/htdocs/opensurvey/img/add-24.png
+++ b/htdocs/opensurvey/img/add-24.png
--- a/htdocs/opensurvey/img/calendar-32.png
+++ b/htdocs/opensurvey/img/calendar-32.png