diff options
9 files changed, 34 insertions, 28 deletions
diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php index 1ea9800546..72d5a3acbe 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 -Subproject 6fbf3bb0f4722183ff3117d2efb12380373de12 +Subproject 16636060a0616040cc567c3296c43d55e779ba8 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 cdbadbaa2a..fe63fbe641 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 66ae5338cf..a068adcd4d 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 14563d3887..b855411727 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6b54dcae7049ed937d01a19238fc62d33adf863f945b27c768c0c4f82548c16 -size 74391 +oid sha256:03c097db06daa76df4c9bc9eab062b3830c49364898467ff0d5c3db920efef28 +size 76446 diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png index e11b4e6329..0ec9b44b84 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e73789714f952abb0d5e1673ff6340eeb0563b07284b7646436802b3109d62a9 -size 178794 +oid sha256:ce3bd400dcd3586fe1874141e386997bc4d3983f73a94beb58e2e43fb76ffbed +size 178968 diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png index f9141294b2..f763bd2c8a 100644 --- a/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4e8e866011ff143a95da23a4366e1306b20eb3670b29f59db2880b2798452ea -size 192744 +oid sha256:3fcce42eb580e158fd1eac73e2146360a33594e65f5d925e561698b07f38dc3d +size 192902 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 7f27f96eed..fa3726eeba 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:743b8d4260a5f7759ef5965a4313f7e4224035bb7a186c2db3ecad6876d8aabf -size 429673 +oid sha256:f5374f56887499ba2aca22f50d02096d7e0fcd6252a90563408ed2512fef077e +size 424564 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 c24b54671b..93374c50e5 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cb4ac6babbc2143080ab724617639d8fbfa4d10b789072be0be65f1170a5a34 -size 301267 +oid sha256:53c71ad2658c4aee22a1e7b376c11cdc9436f05cb8e30f0b1e7ee4f6628e5045 +size 301435 |
