diff options
14 files changed, 28 insertions, 25 deletions
diff --git a/.gitmodules b/.gitmodules index 2e55cc7826..fb478265d7 100644 --- 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
\ No newline at end of file diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 32b9796c3a..0b0b85f21b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b642e64490baa6cd3dc1c8bd4016dab95db9eebdecb44515a472fad9f486f8f0 -size 480461 +oid sha256:3ab39f7a6e41d9d27c0a76436527f1c0acbfa7dc2b544e544274e8d63a5e12cc +size 480474 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index deb7fdf10c..c270913595 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10d8eb25ae4aa52a8f5c4a10d931f900942674311b051275c64885856a5ca613 -size 743813 +oid sha256:8a5a9b63d5f53613caadf67489fabad220a5e0a5205d76ce3014b96589f9d9a1 +size 743842 diff --git a/plugins/TrackingSpamPrevention b/plugins/TrackingSpamPrevention new file mode 160000 +Subproject 86e9502186f07e267600f6deea111fffb908234 diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index 5eb68314ac..a2e1fb0282 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6893fc52e947a6b680880c3df55d1b37874515afb1f429f852f9dd63a2f7af72 -size 377103 +oid sha256:fa889f00365c17dc0677ac0c578ed4303d891571ea2c4c66c85bfffb5a45b459 +size 377142 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index ae7911c50b..4459a565d8 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:367f2c5e9885d33a3d7f775f1c87918f31c68e7517b59c1519879b726b03fc4d -size 735481 +oid sha256:5c25767a04d4dde9651201c3dbad60fe90d919ca0a609a0a11888135b4f8b39c +size 735519 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index e9d32bdf61..3d229b3af6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34e381cc6fb38ebe63cd2f077782eaa6199d7ce02f13105aa55d9beeb3c2c79b -size 4618223 +oid sha256:176e8f1ec1b794c1db86c8862ef2581d5af8b0d824e53776968bb54dbc9d87e7 +size 4830739 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index db020354ac..a69f47bf2b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc -size 159010 +oid sha256:dfb254b3c24287222662cb325e68224dfef0244b078c04ae39a045cad1c32ee2 +size 159023 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index f4100cc360..e3243baf71 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:2107e0051c523ffd1be1b2f5aac35e9306713e1177a4436d3477e4e9789b6cd6 -size 1067380 +oid sha256:f72555e443655cbd8a8cb5a748693a79e1ea58d64a63d9e00dfee99d23052e11 +size 1084898 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index 0cb6c0cbd7..b03ea8a5cb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225bdcd5bf2cd2a58ef83275b6db7d32e1e9e7b9aac4218db45da1b12d2c4108 -size 1069870 +oid sha256:eae87c89382a0090f86042e3136f9bbf24772154292b4e6909472d30282f751d +size 1086330 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 3f2be35d00..7bc1e9e052 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90a7ad14be5467b6c040dbb0f593a3ec91aa2b63c30749459ec28f984b5ae17d -size 1106238 +oid sha256:a48d7a387ca630f0483531e85eda428dd2f125a2893d24e170d2bb5e56ada3a4 +size 1324147 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index db020354ac..a69f47bf2b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc -size 159010 +oid sha256:dfb254b3c24287222662cb325e68224dfef0244b078c04ae39a045cad1c32ee2 +size 159023 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index bbcabe47ee..878b33ab89 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40d6c212eb24cb66925c6410ef317f3f53e4678e9d394117fb1fd18f6a36b480 -size 664122 +oid sha256:7f28ea91a04dde14db4218f9486d90589d3ddf1df471a4a5b4268bbdfdecfe73 +size 664140 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index cd83ed611a..d49ecea3a0 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:0f0f3276be14dce36f52ee9d56e2a1d74fedda4bdee6b8a79a0bf20e926370a5 -size 163454 +oid sha256:2e8b2624a0e735afdc0075694609d059f161c98bb4ede782023285bd23e8c0c1 +size 168876 |