Add tracking spam prevention plugin as a submodule (#17016)

* Add tracking spam prevention plugin as a submodule * update submodule * fix some ui tests * fix tests * fix some tests * update submodule * update screenshots * fix ui tests * updates expected UI files Co-authored-by: sgiehl <stefan@matomo.org>
matomo-org · Jan 14, 2021 · dcfd247 · dcfd247
1 parent 812ee33
commit dcfd247
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 25 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -59,6 +59,9 @@
 [submodule "plugins/CustomVariables"]
 	path = plugins/CustomVariables
 	url = https://github.com/matomo-org/plugin-CustomVariables.git
+[submodule "plugins/TrackingSpamPrevention"]
+	path = plugins/TrackingSpamPrevention
+	url = https://github.com/matomo-org/plugin-TrackingSpamPrevention.git
 
 
 # Add new Plugin submodule above this line ^^
@@ -74,4 +77,4 @@
 	path = plugins/Morpheus/icons
 	url = https://github.com/matomo-org/matomo-icons.git
 
-# Note: do not add new plugin submodules here, but a few lines above
+# Note: do not add new plugin submodules here, but a few lines above
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
diff --git a/plugins/TrackingSpamPrevention b/plugins/TrackingSpamPrevention
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png