Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmisc/log-analytics/import_logs.py2
-rw-r--r--plugins/Installation/templates/firstWebsiteSetup.tpl2
-rw-r--r--plugins/Installation/templates/install.css5
-rw-r--r--plugins/UsersManager/API.php1
4 files changed, 6 insertions, 4 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 7fa06b1356..8c431e37f1 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 8abd7960dd..41360cdd2d 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 1489c2809c..edcc154d25 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 949e4aa8c7..ee28df7216 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 );