Merge pull request #762 from ushahidi/hotfix-2086-mixed-content

ushahidi/platform#2086 make http://... resources scheme relative (//...)
ushahidi · Sep 23, 2017 · e82ed24 · e82ed24
2 parents 86064d2 + 364ab26
commit e82ed24
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/app/common/services/maps.js b/app/common/services/maps.js
@@ -24,7 +24,7 @@ function Maps(ConfigEndpoint, L, _, CONST) {
             },
             hOSM: {
                 name: 'Humanitarian',
-                url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+                url: '//{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
                 layerOptions: {
                     attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="http://hot.openstreetmap.org/">Humanitarian OpenStreetMap</a> | <a href="https://www.mapbox.com/feedback/" target="_blank">Improve the underlying map</a>'
                 }

diff --git a/app/main/activity/activity-timeline.html b/app/main/activity/activity-timeline.html
@@ -77,7 +77,7 @@ <h1 class="postcard-title"><a href="">Overcrowding between 5th St. &amp; Salem A
                <span class="postcard-metadata"><a href="" class="postcard-author"><img src="https://api.adorable.io/avatars/40/abott@adorable.io.png" class="avatar" />Jess Shorland</a>, 45 mins, via SMS</span>
 
                <div class="postcard-field">
-                   <img src="http://lorempixel.com/400/300/" class="postcard-image" />
+                   <img src="//lorempixel.com/400/300/" class="postcard-image" />
                </div>
            </div>
 

diff --git a/app/main/posts/common/post-metadata.html b/app/main/posts/common/post-metadata.html
@@ -12,7 +12,7 @@
       </a>
     </li>
     <li>
-      <img src="http://www.gravatar.com/avatar/{{ post.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
+      <img src="//www.gravatar.com/avatar/{{ post.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
       <strong class="label" ng-show="post.user && !post.author_realname">{{ post.user.realname }}</strong>
       <strong class="label" ng-show="post.contact && !post.author_realname">{{ post.contact.contact}}</strong>
       <strong class="label" ng-show="post.author_realname">{{ post.author_realname}}</strong>

diff --git a/app/main/posts/detail/post-messages.html b/app/main/posts/detail/post-messages.html
@@ -4,7 +4,7 @@ <h3 class="listing-heading" translate>post.messages.title</h3>
     <div ng-repeat="message in messages track by message.id" class="listing-item">
       <div class="listing-item-primary">
         <div class="listing-item-image" ng-if="message.direction == 'outgoing'">
-            <img src="http://www.gravatar.com/avatar/{{ message.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
+            <img src="//www.gravatar.com/avatar/{{ message.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
             <svg class="iconic">
                 <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#arrow-thick-left"></use>
             </svg>

diff --git a/app/main/posts/modify/post-toolbox.html b/app/main/posts/modify/post-toolbox.html
@@ -58,7 +58,7 @@ <h6 class="tool-heading" translate="post.author">Author</h6>
       <div class="listing-item">
         <div class="listing-item-primary" ng-if="showUserRealname()">
           <div class="listing-item-image">
-            <img src="http://www.gravatar.com/avatar/{{ post.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
+            <img src="//www.gravatar.com/avatar/{{ post.user.gravatar || '00000000000000000000000000000000' }}?d=retro&s=40" class="avatar">
           </div>
           <h2 class="listing-item-title">{{ post.user.realname }}</h2>
           <p class="listing-item-secondary"></p>