Merge remote-tracking branch 'origin/stable'

gitcoinco · Apr 17, 2019 · 4acf1a3 · 4acf1a3
2 parents da02a79 + f56df6b
commit 4acf1a3
Show file tree

Hide file tree

Showing 91 changed files with 60,211 additions and 142 deletions.
diff --git a/app/app/urls.py b/app/app/urls.py
@@ -128,6 +128,7 @@
 
     # Hackathons / special events
     re_path(r'^hackathon/(?P<hackathon>.*)?/', dashboard.views.hackathon, name='hackathon'),
+    re_path(r'^hackathon?/', dashboard.views.hackathon, name='hackathon_idx'),
     path('hackathon-list/', dashboard.views.get_hackathons, name='get_hackathons'),
 
     # action URLs

diff --git a/app/app/utils.py b/app/app/utils.py
@@ -249,9 +249,6 @@ def sync_profile(handle, user=None, hide_profile=True):
             except Exception as e:
                 logger.warning(f'Encountered ({e}) while attempting to save a user\'s github avatar')
 
-    if profile and created:
-        profile.build_random_avatar()
-
     return profile
 
 

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -381,6 +381,9 @@ p a {
   max-width: 50px;
   border-radius: 100%;
 }
+.dashboard .body .avatar.Azure-Samples {
+  border-radius: 0%;
+}
 
 .body .nonefound {
   margin-left: 100px;

diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css
@@ -65,6 +65,9 @@ body {
   border-radius: 50px;
   margin-top: 0px;
 }
+.bounty_details .avatar.Azure-Samples {
+  border-radius: 0px;
+}
 
 #avatar_url .avatar {
   width: 80px;

diff --git a/app/assets/v2/css/sidebar_search.css b/app/assets/v2/css/sidebar_search.css
@@ -28,6 +28,10 @@
   margin-bottom: 2px;
 }
 
+.sidebar_search .option.Azure-Samples img {
+  border-radius: 0px !important;
+}
+
 .option label:before,
 .option label:after {
   width: 16px;

diff --git a/app/assets/v2/images/kudos/90_games.svg b/app/assets/v2/images/kudos/90_games.svg
diff --git a/app/assets/v2/images/kudos/Cassette.svg b/app/assets/v2/images/kudos/Cassette.svg
diff --git a/app/assets/v2/images/kudos/ambo_lambo.svg b/app/assets/v2/images/kudos/ambo_lambo.svg
diff --git a/app/assets/v2/images/kudos/blue_spikey_shells.svg b/app/assets/v2/images/kudos/blue_spikey_shells.svg
diff --git a/app/assets/v2/images/kudos/bullbasaur.svg b/app/assets/v2/images/kudos/bullbasaur.svg
diff --git a/app/assets/v2/images/kudos/charmander.svg b/app/assets/v2/images/kudos/charmander.svg
diff --git a/app/assets/v2/images/kudos/cryptokitty/cryptokitty.svg b/app/assets/v2/images/kudos/cryptokitty/cryptokitty.svg
diff --git a/app/assets/v2/images/kudos/cryptokitty/cryptokitty_arm.svg b/app/assets/v2/images/kudos/cryptokitty/cryptokitty_arm.svg
diff --git a/app/assets/v2/images/kudos/cryptokitty/cryptokitty_body.svg b/app/assets/v2/images/kudos/cryptokitty/cryptokitty_body.svg
diff --git a/app/assets/v2/images/kudos/cryptokitty/cryptokitty_head.svg b/app/assets/v2/images/kudos/cryptokitty/cryptokitty_head.svg