diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 7fa06b13562b5495a14f6940fcd8251d6b65c368..8c431e37f1b96b99a33ab0b54b1eb1abca80c20d 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -752,7 +752,7 @@ class Piwik(object): if on_failure is not None: error_message = on_failure(response, kwargs.get('data')) else: - truncate_after = 10000 + truncate_after = 200 truncated_response = (response[:truncate_after] + '..') if len(response) > truncate_after else response error_message = "didn't receive the expected response. Response was %s " % truncated_response diff --git a/plugins/Installation/templates/firstWebsiteSetup.tpl b/plugins/Installation/templates/firstWebsiteSetup.tpl index 8abd7960dd3b1721bb05addbb327377c3d0c43f7..41360cdd2df57796705a153c3e7ddc2064a6cc84 100644 --- a/plugins/Installation/templates/firstWebsiteSetup.tpl +++ b/plugins/Installation/templates/firstWebsiteSetup.tpl @@ -8,7 +8,7 @@ {/if} <h2>{'Installation_SetupWebsite'|translate}</h2> -<br/><p>{'Installation_SiteSetup'|translate}</p> +<p>{'Installation_SiteSetup'|translate}</p> {if isset($errorMessage)} <div class="error"> <img src="themes/default/images/error_medium.png" /> diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/templates/install.css index 1489c2809cec26aa37517524e1fea3fc47df3ca4..edcc154d25f4734710671745b60ced783c3e8bed 100644 --- a/plugins/Installation/templates/install.css +++ b/plugins/Installation/templates/install.css @@ -9,7 +9,10 @@ body { font-family:Arial,Georgia,"Times New Roman",Times,serif; font-size:17px; } - +p { + margin-bottom:5px; + margin-top:10px; +} #title{ font-size:50px; color:#284F92; diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 949e4aa8c7aecf4df324adb90b39f1f534b89cb9..ee28df72162d2c5f7e42af96899202411849b9cd 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -700,7 +700,6 @@ class Piwik_UsersManager_API { if(strlen($md5Password) != 32) { - debug_print_backtrace(); throw new Exception(Piwik_TranslateException('UsersManager_ExceptionPasswordMD5HashExpected')); } return md5($userLogin . $md5Password );