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:
-rw-r--r--README6
-rwxr-xr-xconfig/global.ini.php2
-rw-r--r--core/Piwik.php2
-rw-r--r--misc/iframeWidget.htm2
-rw-r--r--plugins/CoreHome/templates/datatable.js4
-rw-r--r--plugins/CoreHome/templates/datatable_js.tpl1
-rw-r--r--plugins/Referers/Controller.php1
7 files changed, 12 insertions, 6 deletions
diff --git a/README b/README
index db1becca94..73c31a278e 100644
--- a/README
+++ b/README
@@ -9,6 +9,12 @@ the search engines keywords they used, the language they speak… and so much mo
Piwik aims to be an open source alternative to Google Analytics.
+Mission statement
+=================
+« To create, as a community, the leading international open source
+ web analytics application, providing access to all functionality
+ through open components and open APIs. »
+
License
=======
Piwik is released under the GPL v3 license, see misc/license.txt
diff --git a/config/global.ini.php b/config/global.ini.php
index 6b8ded93b6..7434425bb9 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -75,7 +75,7 @@ enable_sql_profiler = false
; Time in seconds after which an archive will be computed again.
; This setting is used only for today's statistics.
; Defaults to 10 seconds so that by default, Piwik provides real time reporting.
-time_before_archive_considered_outdated = 3600
+time_before_archive_considered_outdated = 10
; When loading piwik interface, we redirect the user to 'yesterday' statistics by default
; Possible values: yesterday, today, or any YYYY-MM-DD
diff --git a/core/Piwik.php b/core/Piwik.php
index 0a58743ac7..ec324a5403 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -602,7 +602,7 @@ class Piwik
)
",
- 'option' => "CREATE TABLE {$prefixTables}option (
+ 'option' => "CREATE TABLE `{$prefixTables}option` (
option_name VARCHAR( 64 ) NOT NULL ,
option_value LONGTEXT NOT NULL ,
autoload TINYINT NOT NULL DEFAULT '1',
diff --git a/misc/iframeWidget.htm b/misc/iframeWidget.htm
index d9ce9f35ab..a979bd29af 100644
--- a/misc/iframeWidget.htm
+++ b/misc/iframeWidget.htm
@@ -1,5 +1,5 @@
<html>
<body>
-<div id="widgetIframe"><iframe width="500" height="350" src="http://localhost/trunk/index.php?module=Widgetize&action=iframe&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=2008-11-05&disableLink=1&token_auth=0b809661490d605bfd77f57ed11f0b14" scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+<div id="widgetIframe"><iframe width="500" height="350" src="http://localhost/trunk/index.php?module=Widgetize&action=iframe&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=2008-11-05&disableLink=1" scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
</body></html> \ No newline at end of file
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js
index b40e9a84ac..3d1a7d83a5 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/templates/datatable.js
@@ -565,8 +565,8 @@ dataTable.prototype =
$(this).html( '<a href="#" onClick="' + urlToLink.replace("javascript:","") + '">' + imgToPrepend + $(this).html() + '</a>');
}
else
- {
- $(this).html( '<a target="_blank" href="' + urlToLink + '">' + imgToPrepend + $(this).html() + '</a>');
+ {
+ $(this).html( '<a target="_blank" href="' + urlToLink + '">' + imgToPrepend + $(this).html() + '</a>');
}
});
diff --git a/plugins/CoreHome/templates/datatable_js.tpl b/plugins/CoreHome/templates/datatable_js.tpl
index 83043606f4..c3e5c9e5c3 100644
--- a/plugins/CoreHome/templates/datatable_js.tpl
+++ b/plugins/CoreHome/templates/datatable_js.tpl
@@ -5,6 +5,7 @@ $(document).ready(function(){literal}{{/literal}
dataTables['{$id}'].param = {literal}{{/literal}
{foreach from=$javascriptVariablesToSet key=name item=value name=loop}
{$name}: '{$value}'{if !$smarty.foreach.loop.last},{/if}
+
{/foreach}
{literal}};{/literal}
dataTables['{$id}'].init('{$id}');
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 5051a00a35..58bcba8758 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -78,7 +78,6 @@ class Piwik_Referers_Controller extends Piwik_Controller
'Referers.getKeywords',
'getSearchEnginesFromKeywordId'
);
-
$view->disableExcludeLowPopulation();
$view->setColumnsToDisplay( array('label','nb_visits') );