diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-11-13 08:57:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 08:57:02 +0300 |
| commit | e6a7ace51248f43d0ffa10e2e833bb79b1010182 (patch) | |
| tree | 530d71cd3c854a18b77c8f754f0378ec6bb52c52 /plugins | |
| parent | 50040d5874cd7831f1a90e9e52f8861a444e0d30 (diff) | |
Regenerate OmniFixture dump w/ more xss payloads (#13556)
* Buffing xss testing system.
* More testing changes.
* Finish adding more xss test data.
* Update ui-test.php file.
* Use DI\add in test container override.
* Update OmniFixture.
* Get fixture to setup properly.
* Make xss sanity check work w/ persist fixture data option.
* Another sanity check tweak.
* Trying to debug xss sanity check.
* removing duplicates
* Fix xss testing JS.
* Escape widget category text.
* deal w/ angular input in goal name
* Ensure privacy manager links are safe and add automated test for dangerous links to UI tests.
* Create dangerous link method in xsstesting class.
* Make xss test failures a bit easier to debug and escape metric documentation for angular.
* Tweak quickaccess test.
* Try to get pviot by dimension test to pass.
* Tweak QuickAccess test and try to get xss reports to show.
* Fix exception message.
* Tweaks to fake xss report (cannot currently be displayed).
* Updating screenshots.
* In check for dangerous links test allow empty links that use dangerous prefix.
* fix a cou0le more tests.
* update more screenshots
* Update a couple more screenshots.
* Updated screenshot.
* update screenshots
* update two more screenshots
* Use ng-bind-html to sanitize report documentation which can potentially have HTML.
* update screenshots
Diffstat (limited to 'plugins')
82 files changed, 159 insertions, 157 deletions
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index ed4623c453..30ec198350 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bafb7590170d13adf50e652f85f5a9c916fe8d9f6c4ee95e3e90547b817524c -size 377310 +oid sha256:1e5c09d52c43b4debd7aef2d5fb8b7ff9f970dbd6eb18822333ecfe626bc7bb7 +size 377657 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png index ba7ab2fd13..eefa547c51 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0e2f7637aa4f0f22570ba6809e3738bb26755165b0dabd9b13dfa7d4465f012 -size 352618 +oid sha256:678589775c859ba994d0ed3404cd561ce4bcb4fac2f2b5bd6cc5e7146ed55c59 +size 353106 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png index a15ba6cdb3..25cded6e07 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12cbe63bed57afa70532e0769267a28a288b1c022295bef716b005983fefa5ec -size 80506 +oid sha256:520482039eef4df5801ba782faf0e923d8bfb503bc8cba0be78293464f40d457 +size 81104 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 54abfa97cd..c13a14622d 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce68e23d3b29f3e5233141c1df74603a756f0ce1940f7c80c74158e75cb57002 -size 482260 +oid sha256:6abe39aa817aea33f6788bf334b9b0c5b59019cbc35ff1d7e5ae6a8e85d8f56e +size 483114 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index e32e283c0c..6bc71d852e 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adfd031e477ed8e76e72d0d6ea2774b534dd118c501b13a8c6e82d8d425ebb29 -size 352012 +oid sha256:538c5effef3c4eb719dace5525b05d95517dc8bc9fc925ef6bffde4485d98ab9 +size 352470 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index eae235c336..dfa15e62cf 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99b4dc5d20badb210aa7995d60d36c018b1a371fc46f1b03483eb236cc242354 -size 71291 +oid sha256:4dad5b102f847ec38ab6f0e13b0489d2e12ec5b83c5ec6d813a4bcc34672ebb2 +size 71647 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index 2b4e00fff8..2801cd3fe9 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60ea147848b428c8ab2ccb14d39ae8f28a3ca0ba437ddc9372877e003ef95be0 -size 84405 +oid sha256:c1a38c77c5c5210f72fd0a2c0ff405d0692ba004cf3b69e3d4b40323facdcdf8 +size 86341 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png index 81965eee95..a5d71c0870 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c5671d5423773312e8f6ad4ec1bd7aeb5363c7aaebf1f71da4bcbefb6cc0e9d -size 63264 +oid sha256:bacb72f9bdad4fbe82cb8d120dde484ee7ef11eeca890ba68c7d25549ee68404 +size 63897 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png index 48a7bcf3e6..2c22a595a5 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca56eddb117fb27c2a27a419c8d8f3c41490ac9e5cc7425cb4a5dbbf00d43c22 -size 63782 +oid sha256:918757b28f5bcaad9588e152b92022265a3584c64fea9ec496eaecc8067864bf +size 64335 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index 3f052c4cbc..c054ee649f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bc2633ff33b90db46e17e59402866424d130dea01b4f636e5cd4e0b7f6e328f -size 449487 +oid sha256:57b97b47922488dd700ff2f764ee84b2a88aef81281e8e7a48c2da7d3f609c13 +size 431278 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index 09cf131436..e5a505da17 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d21a7cb9d45bad644cfc1ea8ffd9f8e9cbf8330da9473eacde846d3c569f948 -size 70730 +oid sha256:cc9efc2ff9a5cb13df1dae1101c6f7b6ac41532a477adac2c9e56af5bc5715bb +size 71306 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index 0f02b60613..c6f52f93ae 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9c877245bd20f4a67f7f3ef2b3d3e48d8a94d048136842014d99b42e7371a23 -size 382648 +oid sha256:7fa9d78836385203c8b3b37ca0c651b8fa0aef732f21dc20555d9667e7bca7c6 +size 377167 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 81965eee95..a5d71c0870 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c5671d5423773312e8f6ad4ec1bd7aeb5363c7aaebf1f71da4bcbefb6cc0e9d -size 63264 +oid sha256:bacb72f9bdad4fbe82cb8d120dde484ee7ef11eeca890ba68c7d25549ee68404 +size 63897 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index 60522aac93..a68f4bbf0d 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55a8bb4bebacbe5ca1b288a7b38a13c69469f6d0e016f5a6a5a5e1f8709e6f2e -size 71279 +oid sha256:04b0a22d38330fe11160c64e74461d095978173482fc9548167db412eba1c53c +size 71869 diff --git a/plugins/CoreAdminHome/tests/Integration/TasksTest.php b/plugins/CoreAdminHome/tests/Integration/TasksTest.php index 0c30071eb1..d3ffc66518 100644 --- a/plugins/CoreAdminHome/tests/Integration/TasksTest.php +++ b/plugins/CoreAdminHome/tests/Integration/TasksTest.php @@ -198,11 +198,11 @@ class TasksTest extends IntegrationTestCase public function provideContainerConfig() { return [ - 'observers.global' => [ + 'observers.global' => \DI\add([ ['Mail.send', function (Mail $mail) { $this->mail = $mail; }], - ], + ]), ]; } diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index 428f746004..3d8be6103d 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -41,7 +41,7 @@ {% endif %} <div class="reportDocumentation"> - {% if properties.documentation|default is not empty %}<p>{{ properties.documentation|rawSafeDecoded }}</p>{% endif %} + {% if properties.documentation|default is not empty %}<p ng-bind-html="{{ properties.documentation|json_encode|e('html_attr') }}"></p>{% endif %} {% if reportLastUpdatedMessage is defined and reportLastUpdatedMessage %}<span class='helpDate'>{{ reportLastUpdatedMessage|raw }}</span>{% endif %} </div> diff --git a/plugins/CoreHome/templates/_dataTableHead.twig b/plugins/CoreHome/templates/_dataTableHead.twig index 27ec83dd29..719f599752 100644 --- a/plugins/CoreHome/templates/_dataTableHead.twig +++ b/plugins/CoreHome/templates/_dataTableHead.twig @@ -8,7 +8,7 @@ <span class="icon-help"></span> {{ properties.translations[column]|default(column)|rawSafeDecoded }} </div> - {{ properties.metrics_documentation[column]|raw }} + {{ properties.metrics_documentation[column]|rawSafeDecoded|raw }} </div> {% endif %} <div id="thDIV" class="thDIV">{{ properties.translations[column]|default(column)|rawSafeDecoded }}</div> diff --git a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js index d8785740b9..e995661347 100644 --- a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js +++ b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js @@ -38,7 +38,7 @@ describe('SingleMetricView', function () { it('should handle individual goal metrics properly', function (done) { expect.screenshot("goal_metric").to.be.captureSelector('#widgetCoreVisualizationssingleMetricViewcolumn', function (page) { page.mouseMove('#widgetCoreVisualizationssingleMetricViewcolumn .single-metric-view-picker'); - page.click('.jqplot-seriespicker-popover label:contains(two - Conversions)'); + page.click('.jqplot-seriespicker-popover label:contains(_x)'); }, done); }); diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png index 9f6c1fad0f..99f6d35a23 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25112c77109df9d9283f2d6172475d63cb67efb4609a4be5314bb2aabecf8b5d -size 7907 +oid sha256:66a6cb982bea01d7fb0a3dcd822959f3cd6f6fb90187a65b52ac62ec49b7c078 +size 8004 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png index 92cfa79482..92dad65655 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09e5e38161b1182c758dacf4896f2cea4fb8bac77244b2377c86616c03f044b4 -size 8988 +oid sha256:eea7570515b629ea94d6e7076aa233344434dcd47f8e80ecb35f27238ed9e3b2 +size 11986 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png index 10dd37df8b..a7be95c8fb 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb3be798ea2c8569108b9c86e483740965b9c450236eda1c24c10f92b55d2b6 -size 5407 +oid sha256:b42723cb6694024b3082128828d3274a48992cd95b43cf73c7915d063fd64dc1 +size 5141 diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png index bfcbda25df..89391764f9 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ada23e5b8f8f2e24a63122e58f0ca4ae3f32b24f7558e33f13a89d184e6b5adf -size 6200 +oid sha256:262d4bba480fc6a2b07f2f5b6937c8bad4f628168fb663fbba3e51ef74c9ec8c +size 6256 diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js index c847edeb70..3e85a319cb 100644 --- a/plugins/Dashboard/javascripts/widgetMenu.js +++ b/plugins/Dashboard/javascripts/widgetMenu.js @@ -272,7 +272,7 @@ widgetsHelper.loadWidgetAjax = function (widgetUniqueId, widgetParameters, onWid } for (var widgetCategory in availableWidgets) { - $('.' + settings.categorylistClass, widgetPreview).append('<li>' + widgetCategory + '</li>'); + $('.' + settings.categorylistClass, widgetPreview).append($('<li>').text(widgetCategory)); } return $('.' + settings.categorylistClass, widgetPreview); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index 86f29c57d4..157a1c6529 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0e9e0f54f4aaa087c089bacc5b0084f37efb0e13c5daf558f0fcaf0f043bca7 -size 48890 +oid sha256:2a360d02636d70fa440b6cb4e95aaca6dabad55f70d1640e343328fdf1e08f31 +size 58881 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index 39a1d09d71..9d0b071d4d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f581b26a963cf0b0318ef6277122a3c433803bf9a47c419085f491d27a9f0d0c -size 47830 +oid sha256:02d4190a777e70364f49184562f3b848ce1aca47f005d842120c75ae4d9bc6d3 +size 53852 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 08b4bc5327..42384bc96f 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:31fe6383aec3a6d76a28cc468a27cb3eed32de039acc5dba8722eedd70ded8ea -size 420877 +oid sha256:c3d4eb325ec55b0e1bd04cd5f737e542a989d6183bf085f79a693717820a2799 +size 420222 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 800e666235..20060555ba 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0189c5b0b15e78e0d575180b721e873fc17c441bf5a3418a2afa5068fd206e20 -size 57925 +oid sha256:f995bc255aa52aca7f192322a294109c3273ba6afd1b23262b38dc9697e3618a +size 66430 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index e8caefddbd..89d11d57ff 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76d374477ef2b3898b21b764bab479bb0f297efa1d068b28d2fe7eaf43c8903f -size 69442 +oid sha256:54954c317e63a63eb9daeb1da2e9ca6b7ca064c7bccca7d6b6481b0bc265c19c +size 78132 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png index 5d71bd8f5e..3c63f4f5f0 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9ffb11600122ae994a3c1a45ac0bd96aafe54efcda25e01c3f14214c621dabf -size 28749 +oid sha256:7808f14fbfebd70e8e524bb75c570fb653c1f3f171bb1078cd50f42ff0936a3f +size 29621 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_copied.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_copied.png index f35190e885..ab91394739 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_copied.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_copied.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:044169139f568ecaf3db51192be10b934862656583ada95a9ea60c8e099fd1d0 -size 28489 +oid sha256:0296be4d19ff10baafd26798eb8a841346097bc8edc54f93c27f465209c3c70a +size 29250 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png index 7901990710..63c27e64ce 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:753b90f0fed80937cd4ff9e8978a46345252d7ddae245a3f0f74ed304b588066 -size 28608 +oid sha256:17bcf348ed9ac004a3c7a55cac4ec47510ddcea9f7fe4db1c08ca6e9d547f1e2 +size 29364 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png index 1868eab8d0..0a310b9b2d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b80bbb3fa20ecaee47a8435e66226fbd6c8d3ffe0a9aa45034fd1d926beb5684 -size 27586 +oid sha256:54b059c917a35d04d0d81d2caa3ffd2df908b1676bc741c9d896d24be6fa002f +size 28442 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded.png index 5cbae39298..c5ff37e17c 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a9b8667527c1fbfdb29b588cf82d1328c22b2b2f9bc937b3c3913a9d1f4ff45 -size 29083 +oid sha256:29129b7e8f63b67ea03286f1c2da96787b6081eed5f0b5dfc57dc1af08cd3215 +size 29943 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 9c82e8c27b..8efd3f4851 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a151aaa5548a2c7e6fa4f495a33452fe679677c1230ad0572256455bfd3bd5cc -size 622120 +oid sha256:543726846f47e255af5e931755f3b0d186943a0f63fc0144d0e147354ef7e35a +size 615499 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 0041ce0a72..ff74f6b173 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:f883ff90fefeedb6ffc5bd8246389a3633a445c549bb23b903959210073ce9f7 -size 621753 +oid sha256:da12d9546818453230e414fb3b16a18e67de37f35a9ade03d766bfe4cf05f117 +size 614796 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png index 4084637f58..6083504a10 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b92776b926caddb0e19306d65bb5a5ec9808a34cc863e97c4ad3ddc0d1f94bf -size 28044 +oid sha256:2e82baa3cf3c088c2db711e009a8c5bc202840c4d26cc636c2ae4ef165ec8c40 +size 28913 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index 41945c9433..63b444d9b1 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d9140b5fef8314de3e880a146b06ac361780a21932a1146441d3826a36a26f3 -size 252504 +oid sha256:818a8a5cfad7c7f04bd856d83f8bb03abdbc25cc95d56ec857e13710d5fb1153 +size 252391 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_segmented.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_segmented.png index a2b66cd1e4..a9d272602b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_segmented.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_segmented.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cde4176434990b53ab79a34f7b75cad5bb1085dc5d952a6dfb975edb566916f -size 29988 +oid sha256:296859c04d7957f6fbf320f6103353142da0715e7d805db00365d0dfe1492b20 +size 30987 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png index a6a1fa405d..8025c91661 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8a87353c8501684199d49599b5b8a772cfa9d18a98f569e82554b1245f777ef -size 196899 +oid sha256:a4667d4e5f88fafac87eb7d481aa49d3eaf16205d1fde1de4207e3fe14ad9eeb +size 198855 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png index 8959712207..4f7ba5ea4d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d91e65405d08f1f4b15529f0aa3dea6dee3d52adfb1c4ccd7b256f31e7a3ae6 -size 29641 +oid sha256:a54ac1606f7f44d09b18ec14867d70c20e8a18e79bf3ec4e1cb6e74270ad2be7 +size 30171 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png index 7741dd8d07..22911a4d61 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6539a3bf89884c4e5876c9a0efb07ff50bc941e622652c2d94e767bd077b1b -size 20977 +oid sha256:9ea292e0397669e4c6dd6341dfe54237ab48c8ac0d3e790f369b1d9eb1189fa8 +size 21562 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png index e3adcf07e5..b270a11c88 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f50ccae1c15015fed0f683d7b2efec58791c91d1e5689be2876224a03ee19a3 -size 29026 +oid sha256:e626723b58afed331f29ca257929827de3d68599f8410edfe1de2edb0c020c16 +size 29861 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png index d2f3349f5c..d4727975fc 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0548d00e8a5f3195b0fda2266880cc0cd1cbb4bb5b87e635ff05ae7372ef425b -size 27640 +oid sha256:9f932a015cdcfae13b685f4d84ba739b9cb5afedd37756957646bebe92e3aee5 +size 28507 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png index d2f3349f5c..d4727975fc 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0548d00e8a5f3195b0fda2266880cc0cd1cbb4bb5b87e635ff05ae7372ef425b -size 27640 +oid sha256:9f932a015cdcfae13b685f4d84ba739b9cb5afedd37756957646bebe92e3aee5 +size 28507 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png index d2f3349f5c..d4727975fc 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0548d00e8a5f3195b0fda2266880cc0cd1cbb4bb5b87e635ff05ae7372ef425b -size 27640 +oid sha256:9f932a015cdcfae13b685f4d84ba739b9cb5afedd37756957646bebe92e3aee5 +size 28507 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png index d2f3349f5c..d4727975fc 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0548d00e8a5f3195b0fda2266880cc0cd1cbb4bb5b87e635ff05ae7372ef425b -size 27640 +oid sha256:9f932a015cdcfae13b685f4d84ba739b9cb5afedd37756957646bebe92e3aee5 +size 28507 diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index b03d4407d4..4453b2f352 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -17,6 +17,8 @@ use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Site; use Piwik\View; +require_once PIWIK_INCLUDE_PATH . '/core/Twig.php'; + /** * DataTable Visualization that derives from HtmlTable and sets show_goals_columns to true. */ diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png index 6ca527679f..7432ea3a5c 100644 --- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png +++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a63d797d6a58578ab72b600806c9dc3a702c499918f0032b76e2fb27e57ba19 -size 151012 +oid sha256:a61128a4950c2f7bd20f2fbc706ff99e967fdb1de5905cb98c646e66a333d5fe +size 155351 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png index c5fba3796b..842e405953 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f982e40fa149ad7a4bf80677cbd4c190eb1405df9876e8a81301979ae85c90a2 -size 30106 +oid sha256:55d7cc47c5c38ac323b594fd2f562d02f91e3e8f4cab4013c805d21b1c54228c +size 32655 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png index f0fdb3fbe0..a86335339a 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3fe55aa649022f9ef42ab7eccbd03e439d5c75a279ba8c2ac49a01ee3c202b4 -size 32132 +oid sha256:1f329f6bf179ccb68346c4c1bc5b5cd29e59d634b89ee8f5d9b40c78a5948fca +size 34654 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png index 1e60fdb5fc..c3578b6374 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a0255df1c821d6d1e43d3f39ecca95be36428a856064413c4603624a63010c2 -size 24119 +oid sha256:69dbffaf47f0edee7260eea88767260c08eb280b9ace3c2290fc7e1a82524b6f +size 26615 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_logout_form.png b/plugins/Login/tests/UI/expected-screenshots/Login_logout_form.png index 1e60fdb5fc..c3578b6374 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_logout_form.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_logout_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a0255df1c821d6d1e43d3f39ecca95be36428a856064413c4603624a63010c2 -size 24119 +oid sha256:69dbffaf47f0edee7260eea88767260c08eb280b9ace3c2290fc7e1a82524b6f +size 26615 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png index cd2b7c700a..c0ad5642e9 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae7b55d52382c3cc3ab76225ffcecaf698b7b24a69c981cde41c91cb676cc54c -size 34267 +oid sha256:7c959c705ee233d3f3f113266a78ef910dc89c51ab781d9d0cc0175ce3b6156d +size 36864 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png index f6d3d32e1e..fb31516722 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:548ef9eea921fe491b702a5da26c02743df93c1c1b0ad3a798a81d18a4dd2d47 -size 28540 +oid sha256:3b2097e4b69183b3eba8fee7ee27e7155090f1399d6886a35257d00f8b395fe5 +size 31076 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png index 3a3c1abd9f..1982d12020 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c11f79a81eeeb4ed1464abbbf3f06ea60ef4ea5916e976bb76e8b6875e7975b4 -size 39765 +oid sha256:4166022922106bd808ebbabc3b4eb360cf89a43c95ecf9ca0941e03d65221546 +size 42281 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png index 59af59f097..f17e79a660 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63bb8658911d14fa1fd1db775dfe94d7d0eef628c2975d7fabe13b5fec2bca26 -size 72786 +oid sha256:625ba7474742bf97b743ec9054e9dcce44a98b878eaaab9d28180638331141c6 +size 73852 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png index e38d816c71..244b87118c 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb0c26acd2035b3922cfbc16d68429c63a9f527450eed179559d584357a59586 -size 63223 +oid sha256:8e55a81409fdc7bb6c8eff9652ba7ab34178a8ad7addbdcb77da58a4fb4b7195 +size 55275 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png index 59af59f097..f17e79a660 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63bb8658911d14fa1fd1db775dfe94d7d0eef628c2975d7fabe13b5fec2bca26 -size 72786 +oid sha256:625ba7474742bf97b743ec9054e9dcce44a98b878eaaab9d28180638331141c6 +size 73852 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png index ea2b55930b..e846a14d96 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c36b8421ccb17493ee3563008864f91ec6a36ef1ce22d3e07b892957c367c249 -size 63159 +oid sha256:c6a40f23301723c3d233794a3030761bfc086c799b061ec91e25d42f4168aad5 +size 63880 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png index abef3db931..561abfe8bb 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73644c57e2b59a255651f5dbc5fafc4541d2fd08453e49474934afb0e7c625f3 -size 63109 +oid sha256:a5fe03a4eac244a03a4479b4cbdc0771a07e1182a1eb4a5a2c8af2df3fe90abe +size 55252 diff --git a/plugins/PrivacyManager/templates/footerLinks.twig b/plugins/PrivacyManager/templates/footerLinks.twig index 4d0cfd09c8..61425ebdb0 100644 --- a/plugins/PrivacyManager/templates/footerLinks.twig +++ b/plugins/PrivacyManager/templates/footerLinks.twig @@ -1,5 +1,5 @@ <div id="footerLinks"> - {% if privacyPolicyUrl|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ privacyPolicyUrl|e('html_attr') }}">{{ 'PrivacyManager_PrivacyPolicy'|translate }}</a>{% endif %} + {% if privacyPolicyUrl|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ privacyPolicyUrl|safelink|e('html_attr') }}">{{ 'PrivacyManager_PrivacyPolicy'|translate }}</a>{% endif %} {% if privacyPolicyUrl|default('') is not empty and termsAndCondition|default('') is not empty %}|{% endif %} - {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate }}</a>{% endif %} + {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|safelink|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate }}</a>{% endif %} </div> diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index c63b197f04..5cbae39905 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -764,7 +764,7 @@ class API extends \Piwik\Plugin\API { $availablePeriods = array('day', 'week', 'month', 'never'); if (!in_array($period, $availablePeriods)) { - throw new Exception('Period schedule must be one of the following: ' . implode(', ', $availablePeriods)); + throw new Exception('Period schedule must be one of the following: ' . implode(', ', $availablePeriods) . ' (got ' . $period . ')'); } } diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png index 1ea5114ca3..188503f86f 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f8ce932f4790d07b8e43855b6c06efb2305c65bc65bf2847cc60d9427d5f424 -size 16383 +oid sha256:d5d891a07252a3f7ce28d504c6b475364ed87f2e820c74c0c6df88afb1526d50 +size 16797 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png index 77f37f89ff..f8ea4134c8 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da1d6859fbe0ff8a753478cc2cb37c89587a478d74844b5bc8a5fd98e3778d57 -size 40236 +oid sha256:5de6dfec3d85aa62d65db4b1a27bf8dc50ae64f5e49646a87ce234bc1813a62c +size 37322 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png index 6ac74e3a9e..ac79f828e3 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82390d3d96745addcfe6da4c93b8208772df3f10025bae02eaf1d287af8d2a5f -size 39099 +oid sha256:4e76d29acc7e2eb3e096d0b7ac54c9cbf0b10b3491ecf619e2361605ead4b364 +size 37770 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png index 261724743e..4023ec0022 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9b55256baaa04697bad35adaeca81769ad177c91723b86f8650d5a3659c9cef -size 33680 +oid sha256:5e5e1086a5b5347803b88214b54b8dac33ce26239632090cdb84be0adad6afb2 +size 33652 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png index 1b41ec8317..0d81074d3e 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76e27eaa44db0cb26d93b4e8c8e566b343a9447d520fb88c2b65a075ba6e9129 -size 43115 +oid sha256:cdeb718beb028a8617faa094941e3cf754a6a8ef7c88770574e631758b2009ba +size 43059 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png index 261724743e..4023ec0022 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9b55256baaa04697bad35adaeca81769ad177c91723b86f8650d5a3659c9cef -size 33680 +oid sha256:5e5e1086a5b5347803b88214b54b8dac33ce26239632090cdb84be0adad6afb2 +size 33652 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png index 5beae76578..20005afed6 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f26b56a1d06e46f0bc091a431742c4aabeffda516067c8ac1ef4ecdbfc016e0e -size 47295 +oid sha256:b0e5c1bfda0af265ddd2a5ba7978e56fb1cd7df501affc72ab5787c29dab23c3 +size 47269 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png index 00e1608827..30412e1778 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:745c6d4feb3336c84b66b0e55a60d69aae371599d87558fd5661e4ce13802a0c -size 38060 +oid sha256:16430eabe53039ba00a850a007d665d5f5fd82264062f328f97784c073682687 +size 38035 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png index 1ea5114ca3..188503f86f 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f8ce932f4790d07b8e43855b6c06efb2305c65bc65bf2847cc60d9427d5f424 -size 16383 +oid sha256:d5d891a07252a3f7ce28d504c6b475364ed87f2e820c74c0c6df88afb1526d50 +size 16797 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png index f63229fb05..d1084e3dd0 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f365ce945d8de57f5374439bfc5e912e33a1d0179dffe479eb8b9465278da595 -size 8368 +oid sha256:3d152796cd8dde3f1bade900159febf4402ff54d2e262fd2d5fb9c87f79462bd +size 8369 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png index b9e8c965d4..cc15b2ad96 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:640906effe393ab44e86c05640235672665d771c0c13cfe2e899923ba42170ee -size 32604 +oid sha256:6f8faf7fad55cc744e53564e7cefc22bd72e6033f3c3044a293c92f7865dcb4b +size 32579 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png index 26da5cbf5d..03e5399b40 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b5a9a5d97311876d593b67c37a7e23f1209b389561fa4d413fc343b1f63e211 -size 46351 +oid sha256:b4313d242c46ae6a2b82e20e3803eb2dbe7f8958517fa4eb51b6d2f1e3ef1a9a +size 46326 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png index 19c8bf3a12..fa763b87aa 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:400899dd434c8d84121bb4593cb22a744c18b9c85b7a5aa60f069fe3dc28494c -size 37097 +oid sha256:1d24eca6c2050cae79b85684dc42075edb80c6799ff9be6b170c545b5cb24924 +size 37071 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png index e22d04c21b..a222635a84 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1cec0c447915f235ba4ef30e8af51c4105d157f95d9f8b24d6e44d057dc6a8 -size 17969 +oid sha256:508ab176b7bbb77964a9a8c2c99fd0f0c3cdffb89703f97a6f7960a97bee82dc +size 18337 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png index dd20a27520..0c340fcb3b 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e98bc257c8dc43d9e90546560d8df4b5b920906d8bc7d5e2cc9caf234ca0304 -size 48584 +oid sha256:367d97b9084e459cbd00863d607040538bb3cd0d4a9579a696cc935e4872bd60 +size 48545 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png index e22d04c21b..a222635a84 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1cec0c447915f235ba4ef30e8af51c4105d157f95d9f8b24d6e44d057dc6a8 -size 17969 +oid sha256:508ab176b7bbb77964a9a8c2c99fd0f0c3cdffb89703f97a6f7960a97bee82dc +size 18337 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png index b6a14bfb71..feb318ef8e 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e1c17ca95cf4e6363c2aec1d819f5246c5ad8ecbf919065f31e16302cfeaa18 -size 32536 +oid sha256:525915620392cd80ecf20e6b090aeefc963260f56415bd0accda76db63c8132c +size 32530 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png index ad13051667..84f3f35a79 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c90ef5b02b1e8f7bb817d4aeb3924004ed0f739c5e4e4605649221b6da160c -size 18046 +oid sha256:63eed49517032f3fcf3b51420489372196252add27a03f23bc43ac84a8fcad28 +size 18493 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png index 051051229b..5747b52ba5 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79f1f6fdb2afa9551a17a2cfbdd7f1a8bb113596db9284ef832ed0849d1697e3 -size 51331 +oid sha256:58cd8bdc8450bbe8aa5c84ecf426e4f1e26d5f3d397b3726804db81e89c17acd +size 51287 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png index ad13051667..84f3f35a79 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c90ef5b02b1e8f7bb817d4aeb3924004ed0f739c5e4e4605649221b6da160c -size 18046 +oid sha256:63eed49517032f3fcf3b51420489372196252add27a03f23bc43ac84a8fcad28 +size 18493 |
