Merge master into "3.0"

Conflicts:
	.travis.yml
	CHANGELOG.md
	core/Plugin/ControllerAdmin.php
	core/Version.php
	core/testMinimumPhpVersion.php
	plugins/API/API.php
	plugins/Actions/Reports/GetPageUrls.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/templates/_menu.twig
	plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
	plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
	plugins/Goals/Controller.php
	tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
	tests/PHPUnit/Integration/Plugin/ManagerTest.php
	tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Overlay_spec.js
	tests/UI/specs/UIIntegration_spec.js

9 files changed, 62 insertions, 15 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index ea9a386ced..c9b4a48a7c 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -247,7 +247,7 @@ class Controller extends Plugin\ControllerAdmin
         $view->deactivateNonce = Nonce::getNonce(static::DEACTIVATE_NONCE);
         $view->pluginsInfo = $this->getPluginsInfo($themesOnly);
 
-        $users = \Piwik\Plugins\UsersManager\API::getInstance()->getUsers();
+        $users = Request::processRequest('UsersManager.getUsers');
         $view->otherUsersCount = count($users) - 1;
         $view->themeEnabled = \Piwik\Plugin\Manager::getInstance()->getThemeEnabled()->getPluginName();
 
diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index c4835856b0..b46d1932e4 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -114,14 +114,14 @@ class Marketplace
             $pluginsHavingUpdate = array();
         }
 
-        foreach ($pluginsHavingUpdate as &$updatePlugin) {
+        foreach ($pluginsHavingUpdate as $key => $updatePlugin) {
             foreach ($loadedPlugins as $loadedPlugin) {
                 if (!empty($updatePlugin['name'])
                     && $loadedPlugin->getPluginName() == $updatePlugin['name']
                 ) {
                     $updatePlugin['currentVersion'] = $loadedPlugin->getVersion();
                     $updatePlugin['isActivated'] = $pluginManager->isPluginActivated($updatePlugin['name']);
-                    $updatePlugin = $this->addMissingRequirements($updatePlugin);
+                    $pluginsHavingUpdate[$key] = $this->addMissingRequirements($updatePlugin);
                     break;
                 }
             }
@@ -129,9 +129,7 @@ class Marketplace
 
         // remove plugins that have updates but for some reason are not loaded
         foreach ($pluginsHavingUpdate as $key => $updatePlugin) {
-            if (empty($updatePlugin['currentVersion'])
-                || empty($updatePlugin['isActivated'])
-            ) {
+            if (empty($updatePlugin['currentVersion'])) {
                 unset($pluginsHavingUpdate[$key]);
             }
         }
diff --git a/plugins/CorePluginsAdmin/lang/cs.json b/plugins/CorePluginsAdmin/lang/cs.json
index fa4527c353..8ae77b996f 100644
--- a/plugins/CorePluginsAdmin/lang/cs.json
+++ b/plugins/CorePluginsAdmin/lang/cs.json
@@ -23,7 +23,7 @@
         "Developer": "Vývojář",
         "DevelopersLearnHowToDevelopPlugins": "Vývojáři: naučte se, jak rozšířit Piwik vývojem %szásuvných modulů nebo témat vzhledu%s.",
         "DoMoreContactPiwikAdmins": "Pokud chcete nainstalovat nový zásuvný modul nebo šablonu,, kontaktujte vaše administrátory Piwiku.",
-        "EmailToEnquireUpdatedVersion": "Napište e-mail %1$s a požádejte o novější verzi %2$s.",
+        "EmailToEnquireUpdatedVersion": "Napište email %1$s a požádejte o novější verzi %2$s.",
         "FeaturedPlugin": "Doporučovaný zásuvný modul",
         "ChangeLookByManageThemes": "Vzhled Piwiku můžete změnit %sve správě motivů%s.",
         "GetEarlyAccessForPaidPlugins": "Poznámka: Momentálně jsou všechny zásuvné moduly v obchodě zdarma. V budoucnu máme v plánu povolit placené zásuvné moduly. %sKontaktujte nás%s pro včasný přístup.",
diff --git a/plugins/CorePluginsAdmin/lang/id.json b/plugins/CorePluginsAdmin/lang/id.json
index 100b8e195b..1e4ef37aaa 100644
--- a/plugins/CorePluginsAdmin/lang/id.json
+++ b/plugins/CorePluginsAdmin/lang/id.json
@@ -12,6 +12,7 @@
         "PluginHomepage": "Alamat Pengaya",
         "PluginKeywords": "Kata Kunci",
         "PluginsManagement": "Pengatur Pengaya",
+        "PluginVersionInfo": "%1$s dari %2$s",
         "Status": "Status",
         "Version": "Versi",
         "Websites": "Situs"
diff --git a/plugins/CorePluginsAdmin/lang/ja.json b/plugins/CorePluginsAdmin/lang/ja.json
index 2da547a233..708b4a6560 100644
--- a/plugins/CorePluginsAdmin/lang/ja.json
+++ b/plugins/CorePluginsAdmin/lang/ja.json
@@ -38,12 +38,18 @@
         "LastCommitTime": "(最終更新 %s)",
         "LastUpdated": "最終更新日",
         "LicenseHomepage": "ライセンスのホームページ",
+        "LikeThisPlugin": "このプラグインを気に入りましたか？",
+        "ConsiderDonating": "寄付を検討",
+        "CommunityContributedPlugin": "このプラグインは、コミュニティの貢献により無料で公開されています。",
+        "ConsiderDonatingCreatorOf": "%s の作成者への寄付を検討",
         "PluginsExtendPiwik": "プラグインは Piwik の機能性を拡張します。",
         "OncePluginIsInstalledYouMayActivateHere": "プラグインをインストールすると、ここで有効化と無効化を行うことができます。",
         "Marketplace": "マーケットプレイス",
         "MarketplaceSellPluginSubject": "マーケットプレイス - プラグインの販売",
         "MenuPlatform": "プラットフォーム",
         "MissingRequirementsNotice": "%1$s %3$s が必要です。 %1$s %2$s を最新バージョンにアップデートしてください。",
+        "MissingRequirementsPleaseInstallNotice": "%3$s で必要とされる、 %1$s %2$s をインストールしてください。",
+        "NewVersion": "新しいバージョン",
         "NoPluginsFound": "プラグインは見つかりませんでした",
         "NotAllowedToBrowseMarketplacePlugins": "Piwik プラットフォームのカスタマイズまたは拡張のために、インストール可能なプラグインのリストを閲覧することができます。もしこれらのいづれかのインストールが必要な場合は、管理者にお問い合わせください。",
         "NotAllowedToBrowseMarketplaceThemes": "Piwik プラットフォームの外観をカスタマイズするのにインストール可能な Piwik テーマのリストをご確認ください。これらのいづれかをインストールしたい場合は、管理者にお問い合わせください。",
diff --git a/plugins/CorePluginsAdmin/lang/ko.json b/plugins/CorePluginsAdmin/lang/ko.json
index 6949605d48..406ec44c78 100644
--- a/plugins/CorePluginsAdmin/lang/ko.json
+++ b/plugins/CorePluginsAdmin/lang/ko.json
@@ -1,19 +1,59 @@
 {
     "CorePluginsAdmin": {
+        "ActionActivatePlugin": "플러그인 활성화",
+        "ActionActivateTheme": "테마 활성화",
+        "ActionInstall": "설치",
+        "ActionUninstall": "제거",
         "Activate": "활성화",
         "Activated": "활성화됨",
         "Active": "활성",
+        "Activity": "활동",
+        "AllowedUploadFormats": "zip 포멧을 통해 플러그인이나 테마를 업로드 할 수 있습니다.",
         "AuthorHomepage": "작성자 홈페이지",
+        "Authors": "작성자",
+        "BackToExtendPiwik": "마켓플레이스로 돌아가",
+        "BeCarefulUsingPlugins": "Piwik 팀으로부터 검증되지 않은 플러그인은 사용 시 주의해주세요. 해당 플러그인을 리뷰하지 않았습니다.",
+        "BeCarefulUsingThemes": "Piwik 팀으로부터 검증되지 않은 플러그인은 사용 시 주의해주세요. 해당 플러그인을 리뷰하지 않았습니다.",
+        "Changelog": "변",
         "Deactivate": "비활성화",
+        "Developer": "개발자",
+        "DoMoreContactPiwikAdmins": "새로운 플러그인이나 테마를 설치하기 위해서, Piwik 관리자에게 연락해주세요.",
+        "GetEarlyAccessForPaidPlugins": "참고사항: 모든 플러그인은 현재 무료로 사용할 수 있습니다. 향후 유료 마켓플레이스를 제공할 예정입니다 (자세한 사항은 %s연락 주시길%s 바랍니다.).",
         "Inactive": "비활성",
+        "InstallNewPlugins": "새로운 플러그인 설치",
+        "InstallNewThemes": "새로운 테마 설치",
+        "LastUpdated": "최근 업데이트",
         "LicenseHomepage": "라이센스 홈페이지",
+        "LikeThisPlugin": "플러그인 좋아요",
+        "ConsiderDonating": "기부 고려하기",
         "PluginsExtendPiwik": "플러그인 확장과 Piwik의 기능성 확장페이지입니다.",
         "OncePluginIsInstalledYouMayActivateHere": "플러그인이 한번 설치되면 이곳에서 활성화하거나 비활성화할 수 있습니다.",
+        "Marketplace": "마켓플레이스",
+        "MenuPlatform": "플랫폼",
+        "NewVersion": "새로운 버전",
+        "NoPluginsFound": "플러그인을 찾을 수 없습니다.",
+        "NoThemesFound": "테마를 찾을 수 없습니다.",
+        "NoZipFileSelected": "ZIP 파일을 선택해주세요.",
+        "OriginThirdParty": "서드파티",
         "PluginHomepage": "플러그인 홈페이지",
         "PluginKeywords": "검색어",
         "PluginsManagement": "플러그인 관리",
+        "PluginWebsite": "플러그인 웹사이트",
+        "Screenshots": "스크린샷",
+        "SortByAlpha": "알파버전",
+        "SortByNewest": "최신",
+        "SortByPopular": "인기순",
         "Status": "상태",
+        "StepDownloadingPluginFromMarketplace": "마켓플레이스에서 플러그인 다운로드 중",
+        "StepDownloadingThemeFromMarketplace": "마켓플레이스에서 테마 다운로드 중",
+        "StepUnzippingPlugin": "플러그인 압축 푸는 중",
+        "StepUnzippingTheme": "테마 압축 푸는 중",
+        "Theme": "테마",
+        "Themes": "테마",
+        "ThemesManagement": "테마 관리",
+        "UploadZipFile": "ZIP 파일 업로드",
         "Version": "버전",
+        "ViewRepositoryChangelog": "변경사항 보기",
         "Websites": "웹사이트"
     }
 }
\ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/lang/pt-br.json b/plugins/CorePluginsAdmin/lang/pt-br.json
index a068f02cca..479cc31bb8 100644
--- a/plugins/CorePluginsAdmin/lang/pt-br.json
+++ b/plugins/CorePluginsAdmin/lang/pt-br.json
@@ -8,7 +8,7 @@
         "Activated": "Ativado",
         "Active": "Ativo",
         "Activity": "Atividade",
-        "AllowedUploadFormats": "Você pode fazer upload de um plugin ou tema em formato zip através desta página.",
+        "AllowedUploadFormats": "Você pode carregar um plugin ou tema em formato zip através desta página.",
         "AuthorHomepage": "Página do autor",
         "Authors": "Autores",
         "BackToExtendPiwik": "Voltar ao Marketplace",
@@ -89,8 +89,8 @@
         "TeaserExtendPiwik": "Estenda Piwik com plugins e temas",
         "TeaserExtendPiwikByPlugin": "Estenda Piwik instalando um novo plugin",
         "TeaserExtendPiwikByTheme": "Aproveite um outro look & feel instalando um novo tema",
-        "TeaserExtendPiwikByUpload": "Estenda Piwik fazendo o upload de um arquivo ZIP",
-        "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente plugins do mercado ou %supload um plugin%s em formato .zip.",
+        "TeaserExtendPiwikByUpload": "Estenda o Piwik carregando um arquivo ZIP",
+        "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente plugins do mercado ou %scarregar um plugin%s em formato .zip.",
         "Theme": "Tema",
         "Themes": "Temas",
         "ThemesDescription": "Os temas podem alterar a aparência da interface do usuário do Piwik, e fornecer uma experiência completamente nova visual para desfrutar dos seus relatórios de análise.",
@@ -98,7 +98,7 @@
         "UninstallConfirm": "Você está prestes a desinstalar um plugin %s. O plugin será completamente removido da sua plataforma e isso não poderá ser desfeito. Tem certeza que deseja fazer isso?",
         "Updated": "Atualizado(a)",
         "UpdatingPlugin": "Atualizando %s",
-        "UploadZipFile": "Enviar arquivo ZIP",
+        "UploadZipFile": "Carregar arquivo ZIP",
         "Version": "Versão",
         "ViewRepositoryChangelog": "Ver as mudanças",
         "Websites": "Websites"
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index d7e7c459b0..f0b66123e5 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -184,7 +184,7 @@
                                   'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/'
                             ] %}
                             <span class="plugin-homepage">
-                                <a href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': '&nbsp;'})|raw }})</a>
+                                <a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': '&nbsp;'})|raw }})</a>
                             </span>
                             {% endif %}
 
diff --git a/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php
index dff84a7fee..bbfd7af081 100644
--- a/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php
+++ b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\CorePluginsAdmin\tests\Integration;
 use Piwik\Config;
 use Piwik\Option;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
+use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
@@ -121,7 +122,8 @@ class UpdateCommunicationTest extends IntegrationTestCase
     public function test_sendNotificationIfUpdatesAvailable_ShouldSendCorrectText()
     {
         $subject = 'CoreUpdater_NotificationSubjectAvailablePluginUpdate';
-        $message = 'ScheduledReports_EmailHello
+        $rootUrl = Fixture::getTestRootUrl();
+        $message = "ScheduledReports_EmailHello
 
 CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate
 
@@ -130,9 +132,9 @@ CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate
  * MyTest3 31.0.0
 
 CoreUpdater_NotificationClickToUpdatePlugins
-http://localhost/tests/PHPUnit/proxy/index.php?module=CorePluginsAdmin&action=plugins
+{$rootUrl}index.php?module=CorePluginsAdmin&action=plugins
 
-Installation_HappyAnalysing';
+Installation_HappyAnalysing";
 
         $mock = $this->getCommunicationMockHavingManyUpdates();