diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php index 1ea98005461b694f670721ace88c7123bc9232bc..72d5a3acbeccd321570a024ee671564c36cab94a 100644 --- a/libs/Zend/Validate/Hostname.php +++ b/libs/Zend/Validate/Hostname.php @@ -498,6 +498,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract '電訊盈科' => array(1 => self::VALID_UNICODE_DOMAIN), 'العليان' => array(1 => self::VALID_UNICODE_DOMAIN), '嘉里' => array(1 => self::VALID_UNICODE_DOMAIN), + 'বাংলা' => array(1 => self::VALID_UNICODE_DOMAIN), + 'католик' => array(1 => self::VALID_UNICODE_DOMAIN), + '通販' => array(1 => self::VALID_UNICODE_DOMAIN), + 'پاکستان' => array(1 => self::VALID_UNICODE_DOMAIN), + 'كاثوليك' => array(1 => self::VALID_UNICODE_DOMAIN), + '天主教' => array(1 => self::VALID_UNICODE_DOMAIN), ); diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking index 6fbf3bb0f4722183ff3117d2efb12380373de12e..16636060a0616040cc567c3296c43d55e779ba87 160000 --- a/plugins/QueuedTracking +++ b/plugins/QueuedTracking @@ -1 +1 @@ -Subproject commit 6fbf3bb0f4722183ff3117d2efb12380373de12e +Subproject commit 16636060a0616040cc567c3296c43d55e779ba87 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index cdbadbaa2a3c5801bebcdd073f579afb607ee6c2..fe63fbe64196cf8c75253ea85270b2ce901ef23a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -15,8 +15,8 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> - </a> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + </a> </td> <td align="right"> <a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> @@ -5343,14 +5343,14 @@ There is no data for this report. -<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> + <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> -<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> - Powered by - <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> - <br /> - The leading open analytics platform that respects your privacy. -</p> + <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> + Powered by + <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> + <br /> + The leading open analytics platform that respects your privacy. + </p> </div> </body> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 66ae5338cf408fe25425c7ee304732101dccbeba..a068adcd4dfb4fcf6def4ad02e6c58ea59c30a88 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -15,8 +15,8 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> - </a> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + </a> </td> <td align="right"> <a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests"> @@ -6746,14 +6746,14 @@ There is no data for this report. -<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> + <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> -<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> - Powered by - <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> - <br /> - The leading open analytics platform that respects your privacy. -</p> + <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> + Powered by + <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> + <br /> + The leading open analytics platform that respects your privacy. + </p> </div> </body> diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png index 14563d38879fc7d82ba57b1b5583474e5069115e..b855411727a05171b0b09b5b366bcafb4c0626c4 100644 Binary files a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png and b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png differ diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png index e11b4e63290a84266597cef99fe60b1a4cff078e..0ec9b44b84921ee5f89061e8ffcd9ee8dd326cc4 100644 Binary files a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png and b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png differ diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png index f9141294b2e49f88b8570735e2320edc1f7493b3..f763bd2c8a7ff14b2ff9c2d70a9cd3ae12dec371 100644 Binary files a/tests/UI/expected-screenshots/Installation_js_tracking.png and b/tests/UI/expected-screenshots/Installation_js_tracking.png differ diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 7f27f96eed444b8bdaeb89851335d13f52c24c6e..fa3726eebaf6a369f70feb7bbba5a14d8e1509b0 100644 Binary files a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png and b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index c24b54671b374ddb74f5a2d592148e720d643a57..93374c50e5a089f1ab8741752446023565c61d06 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png differ