diff options
9 files changed, 40 insertions, 55 deletions
diff --git a/package-lock.json b/package-lock.json index 9ce42f8078..2db1f56bcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,29 +5,29 @@ "requires": true, "dependencies": { "angular": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz", - "integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz", + "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==" }, "angular-animate": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.6.10.tgz", - "integrity": "sha512-RU9ZJbTspq0W0x675H5k1DeSgKbAFfp2aiYoNGdlD+wQNKvwwMR5ho+EkDKkx9zE02a5goe8Z6EhhYPQSff9dA==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.0.tgz", + "integrity": "sha512-ROFK3UIn1MSVpqAlay15ZxjPmVbvwaO3Zn/2vhmQdYeqxSbUVuOckcvtDLBpHPGPtOAreu35qfV7NQ7u2EgDcA==" }, "angular-cookies": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.6.10.tgz", - "integrity": "sha512-ADfbqXLhwcaecAiWIaxpl8XWFJgWsrDl/ksSEkYm5dSoXHYlj3HKlAhPbjBv/foYS7pdI0apmSGHWrBPqdjF/g==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.8.0.tgz", + "integrity": "sha512-gWO3RKF0WMmXhseiN3Aw9aEmQ3mB53wSdAxpeKKHbiDwU7vmK+MBuebyOX9qbwZYubn5nM8LByZVmg7T6jOV1w==" }, "angular-mocks": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.10.tgz", - "integrity": "sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.8.0.tgz", + "integrity": "sha512-oFKJIqR6zcsW6V9UQMuUYCXIcTy+n7oYExXxZkvU57hwJQdU1nuNZcSMQA9URiEAPyo7v3bqm0eOP3Ezi7Bigg==" }, "angular-sanitize": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.6.10.tgz", - "integrity": "sha512-01i1Xoq9ykUrsoYQMSB6dWZmPp9Df5hfCqMAGGzJBWZ7L2WY0OtUphdI0YvR8ZF9lAsWtGNtsEFilObjq5nTgQ==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.0.tgz", + "integrity": "sha512-j5GiOPCvfcDWK5svEOVoPb11X3UDVy/mdHPRWuy14Iyw86xaq+Bb+x/em2sAOa5MQQeY5ciLXbF3RRp8iCKcNg==" }, "chroma-js": { "version": "0.6.3", @@ -35,9 +35,9 @@ "integrity": "sha1-tTRPm3ycrO/TJiGE42lvqReo5cA=" }, "iframe-resizer": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-3.6.5.tgz", - "integrity": "sha512-LmwYVNrrKIfVKqwO8dfSlOu5wggnOmr9OwvR1r6lyv33cBqyi3F+Lp5z3mg2wxIHAwf9cxKqtQkvgzkcywwkeg==" + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-3.6.6.tgz", + "integrity": "sha512-WYprloB8s18Be9wbybQZmeEWueEczJH2is/5DxDn4jH8Bs2DuaSuaOeYICe6IvmF04SBy4mQ+pX4Xc+E9FEMSg==" }, "jquery": { "version": "2.2.4", @@ -72,30 +72,15 @@ "jquery": ">=1.4" } }, - "jscrollpane": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jscrollpane/-/jscrollpane-2.2.1.tgz", - "integrity": "sha512-F1Ao3mcR4vNzyB0LTpirfp+8joUlmqWAo/VL9Ha7vPmYBadI9QahpvddQY2LgTGEeoz41GYDNZdCsBVGyPSFjA==", - "requires": { - "jquery": "3.x" - }, - "dependencies": { - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - } - } - }, "materialize-css": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/materialize-css/-/materialize-css-1.0.0.tgz", "integrity": "sha512-4/oecXl8y/1i8RDZvyvwAICyqwNoKU4or5uf8uoAd74k76KzZ0Llym4zhJ5lLNUskcqjO0AuMcvNyDkpz8Z6zw==" }, "mousetrap": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz", - "integrity": "sha512-jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==" + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz", + "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==" }, "ng-dialog": { "version": "1.4.0", diff --git a/package.json b/package.json index 11759d994f..f43799753f 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,13 @@ }, "homepage": "https://github.com/matomo-org/matomo#readme", "dependencies": { - "angular": "^1.6.10", - "angular-animate": "^1.6.10", - "angular-cookies": "^1.6.10", - "angular-mocks": "^1.6.10", - "angular-sanitize": "^1.6.10", + "angular": "^1.8.0", + "angular-animate": "^1.8.0", + "angular-cookies": "^1.8.0", + "angular-mocks": "^1.8.0", + "angular-sanitize": "^1.8.0", "chroma-js": "^0.6.3", - "iframe-resizer": "^3.6.5", + "iframe-resizer": "^3.6.6", "jquery": "^2.2.4", "jquery-mousewheel": "^3.1.13", "jquery-ui-dist": "^1.12.1", @@ -40,7 +40,7 @@ "jquery.dotdotdot": "^1.8.3", "jquery.scrollto": "^1.4.14", "materialize-css": "^1.0.0", - "mousetrap": "^1.6.2", + "mousetrap": "^1.6.5", "ng-dialog": "^1.4.0", "qrcodejs2": "0.0.2", "sprintf-js": "^1.1.2", diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 8343157a67dba1b3d888b11b54226c2428331af +Subproject d75f8dde1f5939a1c7b6d5bbb2d53a6d5929f4c diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png index 9edd6ce932..186475ee8c 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bcfe4d57238c68e1cede32e761ab1467979777e4605c4d4a7b407d21d6e8edc -size 40312 +oid sha256:709294423a8066d7040176492792bf8836d47e493e4588818ae7c5531cbe0c79 +size 40138 diff --git a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js index c0663b8ce1..eb402b1df7 100644 --- a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js +++ b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js @@ -57,7 +57,7 @@ describe("SegmentSelectorEditorTest", function () { expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('3_segment_editor_edit_name'); }); - it("should show the egment editor's available segments dropdown", async function() { + it("should show the segment editor's available segments dropdown", async function() { var elem = await page.$('.available_segments a.dropList'); await elem.hover(); await page.click('.available_segments a.dropList'); @@ -65,7 +65,7 @@ describe("SegmentSelectorEditorTest", function () { }); it("should change segment when another available segment clicked in segment editor's available segments dropdown", async function() { - await (await page.jQuery('.segmentationContainer a.add_new_segment')).click(); + await (await page.jQuery('.ui-menu-item div:contains(Add new segment)')).click(); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('6_segment_editor_different'); }); 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 4abc9bba81..6cc1f6f045 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:17ff13a112db03b10033968831310fd9d225580733fa71d67e4004eb2b583cf9 -size 33770 +oid sha256:6a5fa4c865ec79d50ba214af6c89a80a6332da5feae310d97b0947602b3218da +size 34213 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png index b6bd0e6187..82b59c80a5 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e6eab272abfcfe11e07d8418a4ae36b6be24940c7e24b14bd66daca7e039971 -size 116131 +oid sha256:b8fa287087f6e90df90f91566013e868fb4fb8ed7e1a95d474fbae6efcc09552 +size 114508 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png index 8e2afb3e08..5159225887 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60331f813404c415e2fd3262c24844cfa2de8fce0a9fc980c8051493737c26ec -size 115647 +oid sha256:c1bb4c48dabc5e484d7e3d93db825f25590805c582016112178af4355fada02c +size 113953 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png index e6fb916fbc..ac75756e61 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1adc0aefc0706ecf254950a24e77bc6af1fe8368b029d815f86767aab21d26aa -size 108545 +oid sha256:cb07b7cfb06bb8914e350956875eae3fa6aa8ca2a966696808902877bdee3ddd +size 108527 |
