From 6c79247a4b2c15902cb927a83ccd4bc1fd1396b3 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 13 Jul 2013 11:44:25 +0200 Subject: [PATCH] Merge --- dev/initdata/generate-commande.php | 0 dev/initdata/generate-facture.php | 0 dev/initdata/generate-produit.php | 0 dev/initdata/generate-propale.php | 0 dev/initdata/generate-societe.php | 0 htdocs/admin/pdf.php | 0 htdocs/admin/proxy.php | 0 htdocs/admin/sms.php | 0 htdocs/admin/system/perf.php | 13 ------------- htdocs/admin/translation.php | 0 htdocs/admin/workflow.php | 0 htdocs/core/class/CSMSFile.class.php | 0 htdocs/core/class/commondocgenerator.class.php | 0 htdocs/core/class/extrafields.class.php | 0 htdocs/core/class/genericobject.class.php | 0 htdocs/core/class/hookmanager.class.php | 0 htdocs/core/class/html.formsms.class.php | 0 htdocs/core/class/rssparser.class.php | 0 htdocs/core/class/smtps.class.php | 0 htdocs/core/class/vcard.class.php | 0 .../triggers/interface_20_all_Logevents.class.php | 0 .../interface_20_modPaypal_PaypalWorkflow.class.php | 0 ...terface_20_modWorkflow_WorkflowManager.class.php | 0 .../interface_50_modAgenda_ActionsAuto.class.php | 0 .../interface_50_modLdap_Ldapsynchro.class.php | 0 ...erface_50_modNotification_Notification.class.php | 0 .../triggers/interface_90_all_Demo.class.php-NORUN | 0 htdocs/filefunc.inc.php | 0 htdocs/fourn/commande/index.php | 0 29 files changed, 13 deletions(-) mode change 100644 => 100755 dev/initdata/generate-commande.php mode change 100644 => 100755 dev/initdata/generate-facture.php mode change 100644 => 100755 dev/initdata/generate-produit.php mode change 100644 => 100755 dev/initdata/generate-propale.php mode change 100644 => 100755 dev/initdata/generate-societe.php mode change 100755 => 100644 htdocs/admin/pdf.php mode change 100755 => 100644 htdocs/admin/proxy.php mode change 100755 => 100644 htdocs/admin/sms.php mode change 100755 => 100644 htdocs/admin/translation.php mode change 100755 => 100644 htdocs/admin/workflow.php mode change 100755 => 100644 htdocs/core/class/CSMSFile.class.php mode change 100755 => 100644 htdocs/core/class/commondocgenerator.class.php mode change 100755 => 100644 htdocs/core/class/extrafields.class.php mode change 100755 => 100644 htdocs/core/class/genericobject.class.php mode change 100755 => 100644 htdocs/core/class/hookmanager.class.php mode change 100755 => 100644 htdocs/core/class/html.formsms.class.php mode change 100755 => 100644 htdocs/core/class/rssparser.class.php mode change 100755 => 100644 htdocs/core/class/smtps.class.php mode change 100755 => 100644 htdocs/core/class/vcard.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_20_all_Logevents.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_50_modNotification_Notification.class.php mode change 100755 => 100644 htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN mode change 100755 => 100644 htdocs/filefunc.inc.php mode change 100755 => 100644 htdocs/fourn/commande/index.php diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php old mode 100644 new mode 100755 diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php old mode 100644 new mode 100755 diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php old mode 100644 new mode 100755 diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php old mode 100644 new mode 100755 diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php old mode 100644 new mode 100755 diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php old mode 100755 new mode 100644 diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php old mode 100755 new mode 100644 diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php old mode 100755 new mode 100644 diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index c5bb7993c18..4f24998227a 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -433,18 +433,6 @@ if ($resql) } // Browser -<<<<<<< HEAD -print '
'; -print ''.$langs->trans("Browser").': '; -var_dump($conf->browser); -print '
'; - -// Database statistics update -print '
'; -print ''.$langs->trans("DatabaseStatistics").': '; -print '
'; - -======= print '
'; print ''.$langs->trans("Browser").':
'; if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox'))) @@ -463,7 +451,6 @@ print '
'; print ''.$langs->trans("DatabaseStatistics").': '; print '
'; */ ->>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c llxFooter(); diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php old mode 100755 new mode 100644 diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN old mode 100755 new mode 100644 diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php old mode 100755 new mode 100644 diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php old mode 100755 new mode 100644