https://github.com/matomo-org/matomo/commit/fcb134ed0d43af28fc6ab06914357f158d530859 - Mouve

Site d'origine

Permalink
Browse files

Submodule updates (#16275)

* submodule updates

* update travis.yml

* updates expected test files

* updates expected UI files

* submodule update

* updates expected test files
  • Loading branch information
sgiehl committed Aug 7, 2020
1 parent a3864f4 commit fcb134ed0d43af28fc6ab06914357f158d530859
Showing with 139 additions and 139 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 misc/log-analytics
  3. +1 −1 plugins/AnonymousPiwikUsageMeasurement
  4. +1 −1 plugins/Bandwidth
  5. +2 −2 plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
  6. +1 −1 plugins/CustomAlerts
  7. BIN ...ests/UI/expected-ui-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
  8. BIN ...ensions/tests/UI/expected-ui-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
  9. +1 −1 plugins/CustomVariables
  10. +2 −2 plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
  11. +2 −2 plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
  12. +2 −2 plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
  13. +2 −2 plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
  14. +2 −2 plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
  15. +1 −1 plugins/DeviceDetectorCache
  16. +5 −5 ...OrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
  17. BIN ...erceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
  18. +2 −2 plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
  19. +2 −2 plugins/ImageGraph/tests/UI/expected-screenshots/ImageGraph_horizontal_bar.png
  20. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
  21. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
  22. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png
  23. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
  24. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
  25. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
  26. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
  27. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
  28. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
  29. +2 −2 plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
  30. +1 −1 plugins/LogViewer
  31. +1 −1 plugins/LoginLdap
  32. +1 −1 plugins/MarketingCampaignsReporting
  33. +1 −1 plugins/Morpheus/icons
  34. +1 −1 plugins/Provider
  35. +1 −1 plugins/QueuedTracking
  36. +1 −1 plugins/SecurityInfo
  37. +1 −1 plugins/TagManager
  38. +1 −1 plugins/TasksTimetable
  39. +1 −1 plugins/TreemapVisualization
  40. +2 −2 plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
  41. +2 −2 plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
  42. +1 −1 plugins/VisitorGenerator
  43. +5 −5 ...differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
  44. BIN ...tes_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
  45. +2 −2 tests/UI/expected-screenshots/Comparison_normal_table.png
  46. +2 −2 tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png
  47. +2 −2 tests/UI/expected-screenshots/Comparison_normal_table_no_segments.png
  48. +2 −2 tests/UI/expected-screenshots/Comparison_row_evolution.png
  49. +2 −2 tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png
  50. +2 −2 tests/UI/expected-screenshots/Comparison_subtables_loaded.png
  51. +2 −2 tests/UI/expected-screenshots/Comparison_subtables_paginate.png
  52. +2 −2 tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
  53. +2 −2 tests/UI/expected-screenshots/JSTracker_visitor_log.png
  54. +2 −2 tests/UI/expected-screenshots/Theme_home.png
  55. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
  56. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
  57. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
  58. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
  59. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
  60. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
  61. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
  62. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
  63. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
  64. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
  65. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png
  66. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
  67. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png
  68. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
  69. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png
  70. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png
  71. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
  72. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
  73. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
  74. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
  75. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png
  76. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png
  77. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png
  78. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png
  79. +2 −2 tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
  80. +1 −1 tests/travis
@@ -106,7 +106,7 @@ install:

# travis now complains about this failing 9 times out of 10, so removing it
#- travis_retry composer self-update
- '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install'
- '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install'

before_script:
Submodule log-analytics updated 1 files
+5 −1 import_logs.py
Git LFS file not shown
Binary file not shown.
Binary file not shown.
Submodule CustomVariables updated 1 files
+1 −1 .travis.yml
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown

Large diffs are not rendered by default.

Binary file not shown.
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Submodule LogViewer updated 39 files
+6 −0 .gitattributes
+1 −1 .travis.yml
+10 −11 API.php
+1 −0 CHANGELOG.md
+1 −8 Controller.php
+1 −1 Log/Line.php
+1 −1 Log/Log.php
+1 −1 Log/Parser.php
+4 −4 Log/Parser/Piwik.php
+2 −2 Log/Query.php
+1 −1 Log/Reader.php
+3 −3 Log/Reader/Database.php
+6 −7 Log/Reader/File.php
+3 −3 Log/Result.php
+4 −4 LogReaderFactory.php
+1 −1 LogViewer.php
+1 −6 Menu.php
+1 −1 README.md
+6 −6 angularjs/log-viewer/log-viewer.directive.html
+7 −4 angularjs/log-viewer/log-viewer.directive.less
+3 −3 tests/Framework/TestCase/IntegrationTestCase.php
+2 −4 tests/Integration/ApiTest.php
+1 −1 tests/Integration/Log/Reader/DatabaseTest.php
+1 −1 tests/Integration/Log/Reader/FileTest.php
+2 −4 tests/Integration/LogReaderFactoryTest.php
+9 −6 tests/System/ApiTest.php
+ tests/UI/expected-ui-screenshots/LogViewer_filter_date.png
+ tests/UI/expected-ui-screenshots/LogViewer_filter_requestId.png
+ tests/UI/expected-ui-screenshots/LogViewer_filter_severity.png
+ tests/UI/expected-ui-screenshots/LogViewer_filter_tag.png
+ tests/UI/expected-ui-screenshots/LogViewer_info_no_supported_writer.png
+ tests/UI/expected-ui-screenshots/LogViewer_logview_inital.png
+ tests/UI/expected-ui-screenshots/LogViewer_no_results.png
+ tests/UI/expected-ui-screenshots/LogViewer_preselected_logwriter.png
+ tests/UI/expected-ui-screenshots/LogViewer_search.png
+2 −1 tests/Unit/Log/LineTest.php
+2 −1 tests/Unit/Log/Parser/PiwikTest.php
+2 −2 tests/Unit/Log/QueryTest.php
+2 −1 tests/Unit/Log/ResultTest.php
Submodule MarketingCampaignsReporting updated 80 files
+6 −0 .gitattributes
+1 −1 .travis.yml
+38 −6 API.php
+32 −25 Archiver.php
+14 −13 Campaign/CampaignDetector.php
+5 −3 Campaign/CampaignDetectorInterface.php
+3 −2 Columns/Base.php
+2 −1 Columns/CampaignContent.php
+2 −1 Columns/CampaignId.php
+2 −1 Columns/CampaignKeyword.php
+2 −1 Columns/CampaignMedium.php
+5 −4 Columns/CampaignName.php
+2 −1 Columns/CampaignSource.php
+2 −1 Columns/CampaignSourceMedium.php
+2 −1 Columns/CombinedKeywordContent.php
+10 −8 MarketingCampaignsReporting.php
+2 −1 README.md
+1 −0 Reports/Base.php
+1 −0 Reports/GetContent.php
+27 −0 Reports/GetId.php
+1 −0 Reports/GetKeyword.php
+1 −0 Reports/GetKeywordContentFromNameId.php
+1 −0 Reports/GetMedium.php
+1 −0 Reports/GetName.php
+1 −2 Reports/GetNameFromSourceMediumId.php
+1 −0 Reports/GetSource.php
+1 −0 Reports/GetSourceMedium.php
+7 −6 Tracker/RequestProcessor.php
+5 −4 VisitorDetails.php
+29 −23 config/config.php
+0 −6 lang/ar.json
+0 −6 lang/bg.json
+0 −5 lang/ca.json
+0 −6 lang/cs.json
+0 −6 lang/da.json
+6 −6 lang/de.json
+6 −6 lang/el.json
+6 −9 lang/en.json
+2 −6 lang/es-ar.json
+2 −6 lang/es.json
+0 −6 lang/et.json
+2 −6 lang/fi.json
+2 −6 lang/fr.json
+0 −6 lang/he.json
+0 −6 lang/hi.json
+0 −5 lang/id.json
+2 −6 lang/it.json
+2 −6 lang/ja.json
+0 −6 lang/ko.json
+0 −6 lang/nb.json
+2 −6 lang/nl.json
+0 −6 lang/pl.json
+2 −6 lang/pt-br.json
+2 −6 lang/pt.json
+2 −6 lang/ru.json
+6 −6 lang/sq.json
+0 −6 lang/sr.json
+1 −6 lang/sv.json
+6 −6 lang/tr.json
+0 −6 lang/uk.json
+2 −6 lang/zh-cn.json
+2 −6 lang/zh-tw.json
+6 −6 templates/visitorDetails.twig
+34 −30 tests/Fixtures/TrackAdvancedCampaigns.php
+8 −6 tests/Integration/CustomDimensionConfigTest.php
+2 −1 tests/Integration/ForceNewVisitTest.php
+27 −19 tests/System/TrackSeveralCampaignsTest.php
+2 −0 tests/System/expected/test___MarketingCampaignsReporting.getKeywordContentFromNameId_month.xml
+47 −0 tests/System/expected/test_expanded__MarketingCampaignsReporting.getId_day.xml
+49 −0 tests/System/expected/test_flat__MarketingCampaignsReporting.getId_day.xml
+1 −1 tests/System/expected/test_getKeyword__API.getRowEvolution_day.xml
+1 −1 tests/System/expected/test_getName__API.getRowEvolution_day.xml
+57 −0 tests/System/expected/test_multipleDatesSites___MarketingCampaignsReporting.getId_day.xml
+49 −0 tests/System/expected/test_segmentedMatchAll__MarketingCampaignsReporting.getId_day.xml
+2 −0 tests/System/expected/test_segmentedMatchNone__MarketingCampaignsReporting.getId_day.xml
+1 −1 tests/UI/ReportsByDimensionAddition_spec.js
+ tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_ecommerce.png
+ tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_goals.png
+ tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_Reports_loaded.png
+6 −4 tests/Unit/Campaign/CampaignDetectorTest.php
Submodule icons updated 542 files
Submodule QueuedTracking updated 2 files
+1 −1 .travis.yml
+3 −1 Tasks.php
Git LFS file not shown
Git LFS file not shown

Large diffs are not rendered by default.

Binary file not shown.
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown