Even more HTTPS links #12161
Merged
Even more HTTPS links #12161
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Findus23
added
the
Pull Request WIP
sgiehl
approved these changes
Oct 8, 2017
|
Please don't merge it yet. There are some minor fixes required. (e.g. http://builds-artifacts.piwik.org/piwik/piwik/3.x-dev/24673/UIIntegrationTest_admin_themes.png) |
|
@Findus23 some test files need to be updated |
|
I hope I have now fixed all tests and the new changes didn't break anything. The CustomDimentions plugin tests probably need to be changed: diff --git a/angularjs/manage/list.directive.html b/angularjs/manage/list.directive.html
index bbd410c..50f2243 100644
--- a/angularjs/manage/list.directive.html
+++ b/angularjs/manage/list.directive.html
@@ -2,7 +2,7 @@
<div piwik-content-intro>
<h2 piwik-enriched-headline>{{ 'CustomDimensions_CustomDimensions'|translate }}</h2>
- <p ng-bind-html="('CustomDimensions_CustomDimensionsIntro'|translate:'<a target=_blank href=\'https://piwik.org/docs/custom-dimensions\'>':'</a>':dimensionsList.siteName) + ' ' + ('CustomDimensions_CustomDimensionsIntroNext'|translate:'<a target=_blank href=\'http://piwik.org/docs/custom-variables\'>':'</a>':'<a target=_blank href=\'https://piwik.org/faq/general/faq_21117\'>':'</a>') ">
+ <p ng-bind-html="('CustomDimensions_CustomDimensionsIntro'|translate:'<a target=_blank href=\'https://piwik.org/docs/custom-dimensions\'>':'</a>':dimensionsList.siteName) + ' ' + ('CustomDimensions_CustomDimensionsIntroNext'|translate:'<a target=_blank href=\'https://piwik.org/docs/custom-variables\'>':'</a>':'<a target=_blank href=\'https://piwik.org/faq/general/faq_21117\'>':'</a>') ">
</p>
<p ng-show="dimensionsList.model.isLoading">
diff --git a/tests/System/expected/test___API.getReportMetadata_day.xml b/tests/System/expected/test___API.getReportMetadata_day.xml
index 3a73a10..290d865 100755
--- a/tests/System/expected/test___API.getReportMetadata_day.xml
+++ b/tests/System/expected/test___API.getReportMetadata_day.xml
@@ -135,7 +135,7 @@
<module>CustomVariables</module>
<action>getCustomVariables</action>
<dimension>Custom Variable name</dimension>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1402,7 +1402,7 @@
<module>Actions</module>
<action>getSiteSearchKeywords</action>
<dimension>Keyword</dimension>
- <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
+ <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
<metrics>
<nb_visits>Searches</nb_visits>
<nb_pages_per_search>Search Results pages</nb_pages_per_search>
@@ -2000,7 +2000,7 @@
<module>Referrers</module>
<action>getCampaigns</action>
<dimension>Campaign</dimension>
- <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
+ <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors> |
Findus23
removed
the
Pull Request WIP
(hope I didn't break anything)
sgiehl
force-pushed
the
evenmorehttpslinks
branch
from
d8e5586
to
30e248f
Compare
|
Did some more adjustments, but now everything should be fine. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are even more HTTP links inside of piwik.
I'll have to wait for the tests as I am not sure if it breaks anything.