diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-10-05 11:20:16 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-10-05 11:20:16 +0300 |
| commit | ac0faa735678df52a760272c2c5c77c19a5c8fc1 (patch) | |
| tree | f6b681ba45daebd101bc730f302184f0f4c3b27d /plugins | |
| parent | 808967288ca020e2e69102654cfb2c69934c51ab (diff) | |
| parent | e2c52644eec2c7c5207e7abf5612987384ffd246 (diff) | |
Merge branch '3.x-dev' into apiimprovements
Diffstat (limited to 'plugins')
5 files changed, 11 insertions, 5 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index ef6ad37ea8..536477abb3 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -26,7 +26,6 @@ class AllColumns extends HtmlTable public function beforeRender() { $this->config->show_extra_columns = true; - $this->config->show_exclude_low_population = true; parent::beforeRender(); } diff --git a/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php b/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php index 454237418d..7393877175 100644 --- a/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php +++ b/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php @@ -7,6 +7,7 @@ */ namespace Piwik\Plugins\Diagnostics\Diagnostic; +use Piwik\Development; use Piwik\Filechecks; use Piwik\Translation\Translator; @@ -29,6 +30,10 @@ class FileIntegrityCheck implements Diagnostic { $label = $this->translator->translate('Installation_SystemCheckFileIntegrity'); + if(Development::isEnabled()) { + return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK)); + } + $messages = Filechecks::getFileIntegrityInformation(); $ok = array_shift($messages); diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php index fca1fc76aa..bfac18566d 100644 --- a/plugins/LanguagesManager/Commands/CreatePull.php +++ b/plugins/LanguagesManager/Commands/CreatePull.php @@ -19,7 +19,7 @@ use Symfony\Component\Console\Output\OutputInterface; */ class CreatePull extends TranslationBase { - const GIT_BASE_BRANCH = '2.x-dev'; + const GIT_BASE_BRANCH = '3.x-dev'; protected function configure() { diff --git a/plugins/Morpheus/stylesheets/ui/_map.less b/plugins/Morpheus/stylesheets/ui/_map.less index 731f4e369b..19763eaf25 100644 --- a/plugins/Morpheus/stylesheets/ui/_map.less +++ b/plugins/Morpheus/stylesheets/ui/_map.less @@ -56,7 +56,9 @@ font-size: 14px; } -.uiTest .realTimeMap_datetime { +.uiTest .realTimeMap_datetime, +/* remove the message only in the dashboard as the real time map in its own report shows the same message */ + .uiTest .fullWidgetColumn .showing_visits_of { visibility: hidden; } @@ -70,4 +72,4 @@ .realtime-map[data-name=white-bg] { color: #808080 !important; -}
\ No newline at end of file +} diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig index ac7840337a..5201911d3d 100644 --- a/plugins/ScheduledReports/templates/_addReport.twig +++ b/plugins/ScheduledReports/templates/_addReport.twig @@ -119,7 +119,7 @@ </div> <div class='col s12 m6'> {% endif %} - <div class='reportCategory'>{{ category }}</div> + <h3 class='reportCategory'>{{ category }}</h3> <ul class='listReports'> {% for report in reports %} <li> |