stable -> master

app/app/redis_service.py

@@ -4,6 +4,7 @@
 
 
 class RedisService:
+
     def __new__(cls):
         if not hasattr(cls, 'instance'):
             cls.instance = super().__new__(cls)

app/app/urls.py

@@ -143,7 +143,6 @@
     url(r'^api/v0.1/kudos_search/', dashboard.views.get_kudos, name='kudos_search'),
     url(r'^api/v0.1/choose_persona/', dashboard.views.choose_persona, name='choose_persona'),
 
-
     # chat
     url(r'^chat/', chat.views.embed, name='chat'),
     # Health check endpoint

app/app/utils.py

@@ -460,10 +460,10 @@ def get_profile(request):
 
     return profile
 
+
 class CustomGithubOAuth2(GithubOAuth2):
-    EXTRA_DATA = [
-        ('scope', 'scope'),
-    ]
+    EXTRA_DATA = [('scope', 'scope'), ]
+
     def get_scope(self):
         scope = super(CustomGithubOAuth2, self).get_scope()
         if self.data.get('extrascope'):

app/assets/ens/index.js

@@ -19,3 +19,9 @@ function signMsgAndCreateSubdomain(message, from) {
   });
 }
 
+$(document).ready(function() {
+  $('span.checkbox').click(function() {
+    $('#tos').click();
+  });
+});
+

app/assets/v2/css/bounty.css

@@ -200,11 +200,6 @@ body {
   text-transform: capitalize;
 }
 
-.started-status-column div {
-  display: inline-block;
-  margin: 5px;
-}
-
 .funder-avatar,
 .activity div {
   margin: auto;
@@ -769,17 +764,23 @@ a.btn {
     margin-bottom: 10px;
   }
 
-  /* .bounty-info div {
-    width: 100%;
-  } */
-
   .loading .issue-url {
     font-size: 1rem;
   }
 
   .rocket {
     width: 3.5rem;
   }
+
+  #bounty_actions {
+    margin-top: 10px;
+    margin-bottom: 1rem;
+  }
+
+  .stop-work {
+    float: none;
+    margin-top: 1rem !important;
+  }
 }
 
 @media (max-width: 768px) {
@@ -794,6 +795,13 @@ a.btn {
   #funder_notif_info {
     text-align: center;
   }
+
+  #moderator-admin-actions span {
+    display: inline-block;
+    margin-bottom: 5px;
+    margin-top: 5px;
+  }
+
 }
 
 @media (max-width: 991.98px) {

app/assets/v2/css/grants/detail.css

@@ -102,9 +102,15 @@
   background: white !important;
 }
 
+input:disabled,
+textarea:disabled {
+  background: white;
+  color: #000;
+}
+
 input.editable,
 textarea.editable {
-  margin-top: 6px;
+  margin-top: 6px !important;
   border: 1px solid #e2eaf2;
   background: white;
   padding: 7px 14px !important;

app/assets/v2/css/quests.css

@@ -770,31 +770,31 @@ body.back0.quest_battle {
 
 div.back1,
 body.back1.quest_battle {
-  background: url('/static/v2/images/quests/backs/back1.png') repeat;
+  background: url('/static/v2/images/quests/backs/back1.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back2,
 body.back2.quest_battle {
-  background: url('/static/v2/images/quests/backs/back2.png') repeat;
+  background: url('/static/v2/images/quests/backs/back2.jpeg') repeat;
   background-size: 170%;
 }
 
 div.back3,
 body.back3.quest_battle {
-  background: url('/static/v2/images/quests/backs/back3.png') repeat;
+  background: url('/static/v2/images/quests/backs/back3.jpeg') repeat;
   background-size: 160%;
 }
 
 div.back4,
 body.back4.quest_battle {
-  background: url('/static/v2/images/quests/backs/back4.png') repeat;
+  background: url('/static/v2/images/quests/backs/back4.jpeg') repeat;
   background-size: 160%;
 }
 
 div.back5,
 body.back5.quest_battle {
-  background: url('/static/v2/images/quests/backs/back5.png') repeat;
+  background: url('/static/v2/images/quests/backs/back5.jpeg') repeat;
   background-size: 160%;
 }
 
@@ -806,103 +806,153 @@ body.back6.quest_battle {
 
 div.back7,
 body.back7.quest_battle {
-  background: url('/static/v2/images/quests/backs/back7.png') repeat;
+  background: url('/static/v2/images/quests/backs/back7.jpeg') repeat;
   background-size: 110%;
 }
 
 div.back8,
 body.back8.quest_battle {
-  background: url('/static/v2/images/quests/backs/back8.png') repeat;
+  background: url('/static/v2/images/quests/backs/back8.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back9,
 body.back9.quest_battle {
-  background: url('/static/v2/images/quests/backs/back9.png') repeat;
+  background: url('/static/v2/images/quests/backs/back9.jpeg') repeat;
   background-size: 110%;
 }
 
 div.back10,
 body.back10.quest_battle {
-  background: url('/static/v2/images/quests/backs/back10.png') repeat;
+  background: url('/static/v2/images/quests/backs/back10.jpeg') repeat;
   background-size: 120%;
 }
 
 div.back11,
 body.back11.quest_battle {
-  background: url('/static/v2/images/quests/backs/back11.png') repeat;
+  background: url('/static/v2/images/quests/backs/back11.jpeg') repeat;
   background-size: 105%;
 }
 
 div.back12,
 body.back12.quest_battle {
-  background: url('/static/v2/images/quests/backs/back12.png') repeat;
+  background: url('/static/v2/images/quests/backs/back12.jpeg') repeat;
   background-size: 120%;
 }
 
 div.back13,
 body.back13.quest_battle {
-  background: url('/static/v2/images/quests/backs/back13.png') repeat;
+  background: url('/static/v2/images/quests/backs/back13.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back14,
 body.back14.quest_battle {
-  background: url('/static/v2/images/quests/backs/back14.png') repeat;
+  background: url('/static/v2/images/quests/backs/back14.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back15,
 body.back15.quest_battle {
-  background: url('/static/v2/images/quests/backs/back15.png') repeat;
+  background: url('/static/v2/images/quests/backs/back15.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back16,
 body.back16.quest_battle {
-  background: url('/static/v2/images/quests/backs/back16.png') repeat;
+  background: url('/static/v2/images/quests/backs/back16.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back19,
 body.back19.quest_battle {
-  background: url('/static/v2/images/quests/backs/back19.png') repeat;
+  background: url('/static/v2/images/quests/backs/back19.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back17,
 body.back17.quest_battle {
-  background: url('/static/v2/images/quests/backs/back17.png') repeat;
+  background: url('/static/v2/images/quests/backs/back17.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back18,
 body.back18.quest_battle {
-  background: url('/static/v2/images/quests/backs/back18.png') repeat;
+  background: url('/static/v2/images/quests/backs/back18.jpeg') repeat;
   background-size: 100%;
 }
 
 div.back20,
 body.back20.quest_battle {
-  background: url('/static/v2/images/quests/backs/back20.png') repeat;
+  background: url('/static/v2/images/quests/backs/back20.jpeg') repeat;
   background-size: 120%;
 }
 
 div.back21,
 body.back21.quest_battle {
-  background: url('/static/v2/images/quests/backs/back21.png') repeat;
+  background: url('/static/v2/images/quests/backs/back21.jpeg') repeat;
   background-size: 120%;
 }
 
 div.back22,
 body.back22.quest_battle {
-  background: url('/static/v2/images/quests/backs/back22.png') repeat;
+  background: url('/static/v2/images/quests/backs/back22.jpeg') repeat;
   background-size: 120%;
 }
 
 div.back23,
 body.back23.quest_battle {
-  background: url('/static/v2/images/quests/backs/back23.png') repeat;
+  background: url('/static/v2/images/quests/backs/back23.jpeg') repeat;
+  background-size: 120%;
+}
+div.back24,
+body.back24.quest_battle {
+  background: url('/static/v2/images/quests/backs/back24.jpeg') repeat;
+  background-size: 120%;
+}
+div.back25,
+body.back25.quest_battle {
+  background: url('/static/v2/images/quests/backs/back25.jpeg') repeat;
+  background-size: 120%;
+}
+div.back26,
+body.back26.quest_battle {
+  background: url('/static/v2/images/quests/backs/back26.jpeg') repeat;
+  background-size: 120%;
+}
+div.back27,
+body.back27.quest_battle {
+  background: url('/static/v2/images/quests/backs/back27.jpeg') repeat;
+  background-size: 120%;
+}
+div.back28,
+body.back28.quest_battle {
+  background: url('/static/v2/images/quests/backs/back28.jpeg') repeat;
+  background-size: 120%;
+}
+div.back29,
+body.back29.quest_battle {
+  background: url('/static/v2/images/quests/backs/back29.jpeg') repeat;
+  background-size: 120%;
+}
+div.back30,
+body.back30.quest_battle {
+  background: url('/static/v2/images/quests/backs/back30.jpeg') repeat;
+  background-size: 120%;
+}
+div.back31,
+body.back31.quest_battle {
+  background: url('/static/v2/images/quests/backs/back31.jpeg') repeat;
+  background-size: 120%;
+}
+div.back32,
+body.back32.quest_battle {
+  background: url('/static/v2/images/quests/backs/back32.jpeg') repeat;
+  background-size: 120%;
+}
+div.back33,
+body.back33.quest_battle {
+  background: url('/static/v2/images/quests/backs/back33.jpeg') repeat;
   background-size: 120%;
 }
 

app/assets/v2/js/pages/bounty_details.js

@@ -484,10 +484,10 @@ const isAvailableIfReserved = function(bounty) {
 
 const isBountyOwner = result => {
   if (typeof web3 == 'undefined' || !web3.eth ||
-      typeof web3.eth.coinbase == 'undefined' || !web3.eth.coinbase || !result) {
+      typeof cb_address == 'undefined' || !cb_address || !result) {
     return false;
   }
-  return caseInsensitiveCompare(web3.eth.coinbase, result['bounty_owner_address']);
+  return caseInsensitiveCompare(cb_address, result['bounty_owner_address']);
 };
 
 const isBountyOwnerPerLogin = result => {
@@ -542,18 +542,27 @@ waitforWeb3(function() {
     if (document.web3Changed) {
       return;
     }
+    reloadCbAddress();
 
     if (typeof document.lastWeb3Network == 'undefined') {
       document.lastWeb3Network = document.web3network;
       return;
     }
 
     if (typeof document.lastCoinbase == 'undefined') {
-      document.lastCoinbase = web3 ? web3.eth.coinbase : null;
+
+      try {
+        // invoke infura synchronous call, if it fails metamask is locked
+        document.lastCoinbase = web3.eth.coinbase;
+      } catch (error) {
+        document.lastCoinbase = null;
+        // catch error so sentry doesn't alert on metamask call failure
+        console.log('web3.eth.coinbase could not be loaded');
+      }
       return;
     }
 
-    if (web3 && (document.lastCoinbase != web3.eth.coinbase) ||
+    if (web3 && (document.lastCoinbase != cb_address) ||
       (document.lastWeb3Network != document.web3network)) {
       _alert(gettext('Detected a web3 change.  Refreshing the page. '), 'info');
       document.location.reload();

app/assets/v2/js/pages/new_bounty.js

@@ -462,7 +462,8 @@ $('#sync-issue').on('click', function(event) {
 });
 
 $('#issueURL').focusout(function() {
-  for (let i = 0; i <= document.blocked_urls.length; i++) {
+
+  for (let i = 0; i < document.blocked_urls.length; i++) {
     let this_url_filter = document.blocked_urls[i];
 
     if ($('input[name=issueURL]').val().toLowerCase().indexOf(this_url_filter.toLowerCase()) != -1) {
@@ -471,6 +472,7 @@ $('#issueURL').focusout(function() {
       return false;
     }
   }
+
   if (isPrivateRepo) {
     setPrivateForm();
     var validated = $('input[name=issueURL]').val() == '' || !validURL($('input[name=issueURL]').val());