Merge remote-tracking branch 'refs/remotes/origin/master' into improveStoreSearch

Author: jjeffryes

js/templates/transactionModal.html

@@ -6,7 +6,7 @@ <h2 class="ion-android-close clickable"></h2>
   <% if(ob.invalidData){ %>
   <div class="fullCentered"><h2><%= polyglot.t('errorMessages.serverError') %></h2></div>
   <% } else { %>
-  <div class="modal-hero js-transactionHero shadow-inner1-light overflowHidden"
+  <div class="modal-hero js-transactionHero shadow-inner1-light"
     <% if(ob.vendor_offer.listing.item.image_hashes){ %>
     style="background-image: url(<%= ob.serverUrl %>get_image?hash=<%= ob.vendor_offer.listing.item.image_hashes[0] %>&guid=<%=ob.vendor_offer.listing.id.guid %>), url(imgs/defaultBanner.png);"
     <% } else { %>

main.js

@@ -638,8 +638,8 @@ app.on('ready', function() {
     autoUpdater.quitAndInstall();
   });
 
-  var feedURL = 'http://updates.openbazaar.org:5000/update/' + platform + '/' + version;
-  autoUpdater.setFeedURL(feedURL);
+  var feedURL = 'https://updates.openbazaar.org:5001/update/' + platform + '/' + version;
+  autoUpdater.setFeedURL(feedURL)
   mainWindow.webContents.executeJavaScript("console.log('Checking for new versions at " + feedURL + " ...')");
 
   // Check for updates every hour