diff options
6 files changed, 11 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index a86f9ffe7f..c5eaa0f847 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,7 +50,10 @@ path = plugins/LoginLdap url = https://github.com/piwik/plugin-LoginLdap.git branch = master - +[submodule "plugins/MarketingCampaignsReporting"] + path = plugins/MarketingCampaignsReporting + url = https://github.com/piwik/plugin-MarketingCampaignsReporting.git + branch = master # Add new Plugin submodule above this line ^^ # diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting new file mode 160000 +Subproject 50c520eb9608b59c2e1abea09bbe70a553c834a diff --git a/tests/PHPUnit/Framework/TestingEnvironmentVariables.php b/tests/PHPUnit/Framework/TestingEnvironmentVariables.php index 596daa82f2..ef4b34449e 100644 --- a/tests/PHPUnit/Framework/TestingEnvironmentVariables.php +++ b/tests/PHPUnit/Framework/TestingEnvironmentVariables.php @@ -105,6 +105,7 @@ class TestingEnvironmentVariables $disabledPlugins = $pluginList->getCorePluginsDisabledByDefault(); $disabledPlugins[] = 'LoginHttpAuth'; $disabledPlugins[] = 'LoginLdap'; + $disabledPlugins[] = 'MarketingCampaignsReporting'; $disabledPlugins[] = 'ExampleVisualization'; $disabledPlugins = array_diff($disabledPlugins, array( diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 27f9d770e1..8636a11726 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7fec3803c8cffdc013bfff529662092c3d14519c188342c19a165da15e01620 -size 976409 +oid sha256:05739f4983fadd53b2ef2ccb19fd63ac926a797dbba00a0c1ea4947adcdfcbdd +size 998448 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index df77d61967..9e9d5b9223 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64daa79a981cc4fa26baa2b88a4883bcc23a28e291bfaa14855b1c075a0888e6 -size 4233315 +oid sha256:1978495aeb6ec013d3d192368d2ba129193da25aa4f0d1c0b7aa0f17c6e47ff0 +size 4355323 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index 98ed0d33c2..0fc34b7348 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce4997e90ad02cac0b258440b26181a3dab713c9fbabfab71156d37c1ac69d3b -size 196162 +oid sha256:0928197e1ce7e33e4080043a11add57af4ef0d597d394e0b2370ef6d68cf5896 +size 202320 |
