diff options
| author | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
| commit | b22dee447834c12f1095ba8ecf356970b2312dbf (patch) | |
| tree | 46a966716922f3d44734929486c43a26d37230f7 /plugins/Actions/Reports | |
| parent | 72fa5107adcdbe1f4b8850f89c95dd3d5f5e6f4a (diff) | |
| parent | 611316e743d17d819b511d008da0e80e6425b686 (diff) | |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
plugins/CoreHome/javascripts/corehome.js
plugins/Ecommerce/Menu.php
plugins/Events/Events.php
plugins/Goals/Goals.php
plugins/Live/templates/index.twig
plugins/UserCountryMap/UserCountryMap.php
plugins/UsersManager/stylesheets/usersManager.less
plugins/VisitsSummary/Controller.php
plugins/VisitsSummary/Reports/Get.php
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/Actions/Reports')
| -rw-r--r-- | plugins/Actions/Reports/GetEntryPageUrls.php | 2 | ||||
| -rw-r--r-- | plugins/Actions/Reports/GetExitPageUrls.php | 1 | ||||
| -rw-r--r-- | plugins/Actions/Reports/GetPageTitles.php | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php index c934c7ab10..dfeeb8cf04 100644 --- a/plugins/Actions/Reports/GetEntryPageUrls.php +++ b/plugins/Actions/Reports/GetEntryPageUrls.php @@ -8,10 +8,8 @@ */ namespace Piwik\Plugins\Actions\Reports; -use Piwik\Common; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\API\Request; use Piwik\Plugins\Actions\Columns\EntryPageUrl; use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php index f46ac478cd..bc4d29782d 100644 --- a/plugins/Actions/Reports/GetExitPageUrls.php +++ b/plugins/Actions/Reports/GetExitPageUrls.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\Actions\Reports; -use Piwik\Common; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\API\Request; diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php index 0c70086611..ed1846ddd6 100644 --- a/plugins/Actions/Reports/GetPageTitles.php +++ b/plugins/Actions/Reports/GetPageTitles.php @@ -11,7 +11,6 @@ namespace Piwik\Plugins\Actions\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\API\Request; -use Piwik\Common; use Piwik\Plugins\Actions\Columns\PageTitle; use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; |