From cf2896b4d309604866daa2776bdcc300fe849e36 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sun, 13 Dec 2015 15:42:53 +0000
Subject: [PATCH 1/6] Fixed dialog service version

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index f171576..b2c0a66 100755
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
     "angular-bootstrap": "~0.13.3",
     "angular-cookies": ">=1.2.*",
     "angular-deferred-bootstrap": "~0.1.7",
-    "angular-dialog-service": "~5.2.6",
+    "angular-dialog-service": "5.2.8",
     "angular-jwt": "~0.0.9",
     "angular-loading-bar": "~0.8.0",
     "angular-mocks": "~1.4.5",

From 265ecd2ad92578a26c92c199de18e45a651cc95b Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sun, 13 Dec 2015 15:46:03 +0000
Subject: [PATCH 2/6] Update angular version

---
 bower.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index b2c0a66..1b3079b 100755
--- a/bower.json
+++ b/bower.json
@@ -5,7 +5,7 @@
     "SoundManager2": "soundmanager#*",
     "angular": "~1.4.3",
     "angular-animate": "*",
-    "angular-bootstrap": "~0.13.3",
+    "angular-bootstrap": "~0.14.3",
     "angular-cookies": ">=1.2.*",
     "angular-deferred-bootstrap": "~0.1.7",
     "angular-dialog-service": "5.2.8",
@@ -44,8 +44,8 @@
     "angular-scenario": ">=1.2.*"
   },
   "resolutions": {
-    "angular": "~1.4.3",
-    "angular-bootstrap": "~0.13.3",
-    "js-data-angular": "~3.1.0"
+    "js-data-angular": "~3.1.0",
+    "angular-bootstrap": "~0.14.3",
+    "angular": "1.4.8"
   }
 }

From 4adc804e5611704c86bf57d7286325e9a14a9c1b Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sun, 13 Dec 2015 17:08:53 +0000
Subject: [PATCH 3/6] Remove gi from navbar search

---
 client/app/components/navbar/navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index 000dad1..8f8f9e6 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -29,7 +29,7 @@
                            typeahead-loading="loadingSearchResults"
                            class="form-control"/>
                     <div class="input-group-btn">
-                        <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i>
+                        <button class="btn btn-default" type="submit"><i class="fa fa-search"></i>
                         </button>
                     </div>
                 </div>

From d9e06bf1ba9b73a6a26949f7c8f88a31009c2c31 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 16 Dec 2015 20:41:17 +0000
Subject: [PATCH 4/6] Fixed navbar and mobile play issue

---
 bower.json                                    |   2 +-
 client/app/app.less                           |   5 -
 client/app/components/navbar/navbar.html      |  40 +--
 client/app/components/navbar/navbar.less      | 340 +-----------------
 .../audio/audio.player.directive.js           |  24 +-
 client/app/directives/audio/audio.player.html |  19 +-
 client/app/services/audio/audio.service.js    |   2 +-
 client/app/views/mixes/mixes.directive.html   |   7 +-
 client/app/views/mixes/mixes.directive.js     |  21 +-
 .../views/mixes/upload/upload.controller.js   |   2 +-
 client/app/views/templates/searchResult.html  |   2 +-
 client/assets/fuckyouchrome.mp3               | Bin 0 -> 1410 bytes
 client/index.html                             |   6 +-
 13 files changed, 57 insertions(+), 413 deletions(-)
 create mode 100644 client/assets/fuckyouchrome.mp3

diff --git a/bower.json b/bower.json
index 1b3079b..6953547 100755
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
     "angular-bootstrap": "~0.14.3",
     "angular-cookies": ">=1.2.*",
     "angular-deferred-bootstrap": "~0.1.7",
-    "angular-dialog-service": "5.2.8",
+    "angular-dialog-service": "~5.2.8",
     "angular-jwt": "~0.0.9",
     "angular-loading-bar": "~0.8.0",
     "angular-mocks": "~1.4.5",
diff --git a/client/app/app.less b/client/app/app.less
index a0876c5..ee4e1cb 100755
--- a/client/app/app.less
+++ b/client/app/app.less
@@ -79,8 +79,3 @@
     width: 32px;
     height: 32px;
 }
-
-ul.dropdown-menu{
-    left: -112px!important;
-    width: 480px!important;
-}
\ No newline at end of file
diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index 8f8f9e6..b3b35d3 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -19,15 +19,15 @@
                     <span>Upload</span>
                 </a>
             </li>
-        </ul>
-        <div class="col-sm-3 col-md-3">
+        </ul>n
+        <div class="col-sm-6 col-md-6">
             <form class="navbar-form" role="search">
                 <div class="input-group">
                     <input type="text" ng-model="selected" placeholder="Search..."
-                           typeahead="result for results in getSearchResults($viewValue)"
+                           uib-typeahead="result for results in getSearchResults($viewValue)"
                            typeahead-template-url="app/views/templates/searchResult.html"
                            typeahead-loading="loadingSearchResults"
-                           class="form-control"/>
+                           class="form-control navbar-search"/>
                     <div class="input-group-btn">
                         <button class="btn btn-default" type="submit"><i class="fa fa-search"></i>
                         </button>
@@ -36,7 +36,6 @@
             </form>
         </div>
         <ul class="nav navbar-nav navbar-right">
-            <!--
             <li id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
                 <a href="#" class="dropdown-toggle " data-toggle="dropdown" id="notifications-button">
                     <i class="fa fa-envelope"></i>
@@ -46,37 +45,6 @@
                     <dss-notifications/>
                 </ul>
             </li>
-            -->
-            <li id="LI_1"  id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
-                <a href="#" class="dropdown-toggle " data-toggle="dropdown" id="notifications-button">
-                    <i class="fa fa-envelope"></i>
-                    <span class="label label-lightred notification-label">{{notificationCount}}</span>
-                </a>
-
-                <ul id="UL_5" class="dropdown-menu message-ul">
-                    <li id="LI_6">
-                        <span id="SPAN_7">You have 9 messages</span>
-                    </li>
-                    <li id="LI_8">
-                        <a href="index.html#" id="A_9"> <span id="SPAN_10"><img src="assets/img/avatar.jpg" alt="Avatar" id="IMG_11" /></span> <span id="SPAN_12"> <span id="SPAN_13">Łukasz Holeczek</span> <span id="SPAN_14">6 min</span></span> <span id="SPAN_15">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
-                    </li>
-                    <li id="LI_16">
-                        <a href="index.html#" id="A_17"> <span id="SPAN_18"><img src="assets/img/avatar2.jpg" alt="Avatar" id="IMG_19" /></span> <span id="SPAN_20"> <span id="SPAN_21">Megan Abott</span> <span id="SPAN_22">56 min</span></span> <span id="SPAN_23">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
-                    </li>
-                    <li id="LI_24">
-                        <a href="index.html#" id="A_25"> <span id="SPAN_26"><img src="assets/img/avatar3.jpg" alt="Avatar" id="IMG_27" /></span> <span id="SPAN_28"> <span id="SPAN_29">Kate Ross</span> <span id="SPAN_30">3 hours</span></span> <span id="SPAN_31">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
-                    </li>
-                    <li id="LI_32">
-                        <a href="index.html#" id="A_33"> <span id="SPAN_34"><img src="assets/img/avatar4.jpg" alt="Avatar" id="IMG_35" /></span> <span id="SPAN_36"> <span id="SPAN_37">Julie Blank</span> <span id="SPAN_38">yesterday</span></span> <span id="SPAN_39">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
-                    </li>
-                    <li id="LI_40">
-                        <a href="index.html#" id="A_41"> <span id="SPAN_42"><img src="assets/img/avatar5.jpg" alt="Avatar" id="IMG_43" /></span> <span id="SPAN_44"> <span id="SPAN_45">Jane Sanders</span> <span id="SPAN_46">Jul 25, 2012</span></span> <span id="SPAN_47">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
-                    </li>
-                    <li id="LI_48">
-                        <a id="A_49">View all messages</a>
-                    </li>
-                </ul>
-            </li>
 
             <li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
                 <a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{ $root.currentUser.display_name }}
diff --git a/client/app/components/navbar/navbar.less b/client/app/components/navbar/navbar.less
index de458ca..aac13ab 100644
--- a/client/app/components/navbar/navbar.less
+++ b/client/app/components/navbar/navbar.less
@@ -68,342 +68,10 @@ nav > div.collapse.navbar-collapse > ul > li > a {
   position: relative;
 }
 
-#notifications-button i{
+#notifications-button i {
   font-size: 18px;
 }
 
-#LI_1 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  display: block;
-  float: left;
-  height: 40px;
-  position: relative;
-  width: 46px;
-  perspective-origin: 23px 20px;
-  transform-origin: 23px 20px;
-  border: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#LI_1*/
-
-#A_2 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  cursor: pointer;
-  display: inline-block;
-  height: 30px;
-  position: relative;
-  text-align: center;
-  text-decoration: none;
-  vertical-align: middle;
-  white-space: nowrap;
-  width: 40px;
-  perspective-origin: 20px 15px;
-  transform-origin: 20px 15px;
-  background: rgb(64, 69, 74) none repeat scroll 0% 0% / auto padding-box border-box;
-  border: 0px none rgb(255, 255, 255);
-  border-radius: 2px 2px 2px 2px;
-  font: normal normal normal normal 12px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  margin: 5px 3px;
-  outline: rgb(255, 255, 255) none 0px;
-  padding: 5px 0px;
-}
-
-/*#A_2*/
-
-#I_3 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  cursor: pointer;
-  display: inline-block;
-  height: 12px;
-  text-align: center;
-  white-space: nowrap;
-  width: 12.0156px;
-  perspective-origin: 6px 6px;
-  transform-origin: 6px 6px;
-  border: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 12px / 12px FontAwesome;
-  list-style: none outside none;
-  margin: 2px 0px 0px;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#I_3*/
-
-#I_3:before {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  content: '""';
-  cursor: pointer;
-  text-align: center;
-  white-space: nowrap;
-  border: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 12px / 12px FontAwesome;
-  list-style: none outside none;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#I_3:before*/
-
-#SPAN_4 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  cursor: pointer;
-  display: block;
-  height: 20px;
-  position: absolute;
-  right: 3px;
-  text-align: center;
-  top: -3px;
-  white-space: nowrap;
-  width: 4.64062px;
-  perspective-origin: 2.3125px 10px;
-  transform-origin: 2.3125px 10px;
-  border: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 8px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#SPAN_4*/
-
-#UL_5 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  display: none;
-  float: left;
-  height: auto;
-  left: 0px;
-  max-width: 300px;
-  min-width: 166px;
-  position: absolute;
-  text-align: left;
-  top: 90%;
-  width: auto;
-  z-index: 1000;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  background: rgb(255, 255, 255) none repeat scroll 0% 0% / auto padding-box border-box;
-  border: 1px solid rgb(219, 222, 224);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  margin: 0px;
-  outline: rgb(255, 255, 255) none 0px;
-  padding: 0px;
-}
-
-/*#UL_5*/
-
-#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  height: auto;
-  min-width: 260px;
-  width: auto;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border-top: 0px none rgb(255, 255, 255);
-  border-right: 0px none rgb(255, 255, 255);
-  border-bottom: 1px solid rgb(233, 235, 236);
-  border-left: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40*/
-
-#SPAN_7 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  display: block;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-  padding: 5px 10px;
-}
-
-/*#SPAN_7*/
-
-#A_9, #A_17, #A_25, #A_33, #A_41 {
-  background-position: 0px 0px;
-  box-sizing: border-box;
-  clear: both;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  display: block;
-  text-align: left;
-  text-decoration: none;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  background: rgba(0, 0, 0, 0) none repeat scroll 0px 0px / auto padding-box border-box;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-  padding: 5px 10px;
-}
-
-/*#A_9, #A_17, #A_25, #A_33, #A_41*/
-
-#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42*/
-
-#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  display: block;
-  float: left;
-  height: 40px;
-  text-align: left;
-  vertical-align: middle;
-  width: 40px;
-  border: 0px none rgb(52, 56, 60);
-  border-radius: 2px 2px 2px 2px;
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  margin: 5px 10px 0px 0px;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43*/
-
-#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  display: block;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44*/
-
-#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal bold normal 12px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45*/
-
-#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  display: block;
-  position: absolute;
-  right: 5px;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: italic normal bold normal 11px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46*/
-
-#SPAN_15, #SPAN_23, #SPAN_39 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 11px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_15, #SPAN_23, #SPAN_39*/
-
-#SPAN_31, #SPAN_47 {
-  box-sizing: border-box;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  text-align: left;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 11px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-}
-
-/*#SPAN_31, #SPAN_47*/
-
-#LI_48 {
-  box-sizing: border-box;
-  color: rgb(255, 255, 255);
-  height: auto;
-  min-width: 260px;
-  width: auto;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  border: 0px none rgb(255, 255, 255);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(255, 255, 255) none 0px;
-}
-
-/*#LI_48*/
-
-#A_49 {
-  box-sizing: border-box;
-  clear: both;
-  color: rgb(52, 56, 60);
-  cursor: pointer;
-  display: block;
-  text-align: center;
-  text-decoration: none;
-  perspective-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box;
-  border: 0px none rgb(52, 56, 60);
-  font: normal normal normal normal 14px / 20px Lato, sans-serif;
-  list-style: none outside none;
-  outline: rgb(52, 56, 60) none 0px;
-  padding: 5px 10px;
-}
-
-/*#A_49*/
-
+.navbar-search {
+  width: 412px;
+}
\ No newline at end of file
diff --git a/client/app/directives/audio/audio.player.directive.js b/client/app/directives/audio/audio.player.directive.js
index f5966b3..a574613 100644
--- a/client/app/directives/audio/audio.player.directive.js
+++ b/client/app/directives/audio/audio.player.directive.js
@@ -95,18 +95,24 @@ angular.module('dssWebApp')
                         case PLAYSTATES.stopped:
                         default:
                             AudioService.stop();
-                            $scope.mix.getStreamUrl().then(function (response) {
-                                AudioService.play($scope.mix, response.data.url).then(function () {
-                                    $scope.playingId = $scope.mix.slug;
-                                    _addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
+                            var d = soundManager.createSound({
+                                url: 'assets/fuckyouchrome.mp3',
+                                onfinish: function () {
+                                    $scope.mix.getStreamUrl().then(function (response) {
+                                        AudioService.play($scope.mix, response.data.url).then(function () {
+                                            $scope.playingId = $scope.mix.slug;
+                                            _addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
 
-                                    $scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
-                                        .then(function (response) {
-                                            $scope.mix.plays.push(response);
+                                            $scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
+                                                .then(function (response) {
+                                                    $scope.mix.plays.push(response);
+                                                });
                                         });
-                                });
-                                $scope.playState = 1;
+                                        $scope.playState = 1;
+                                    });
+                                }
                             });
+                            d.play();
                             break;
                     }
                 };
diff --git a/client/app/directives/audio/audio.player.html b/client/app/directives/audio/audio.player.html
index 635b1a3..429f9a7 100644
--- a/client/app/directives/audio/audio.player.html
+++ b/client/app/directives/audio/audio.player.html
@@ -43,13 +43,10 @@
                             {{mix.user.display_name}}
                         </a>
                         <a href="#" ng-click="toggleFollow()" ng-show="currentUser"
-                           tooltip="tooltip" data-toggle="tooltip"
-                           title="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}"
-                           data-placement="top">
+                           uib-tooltip="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}">
                             <i class="fa fa-user-plus"
                                ng-class="mix.user.is_following ? 'text-danger' : 'text-success'"></i>
                         </a>
-
                         <div class="meta-artist"><span class="the-name ng-binding">{{mix.title}}</span></div>
                     </div>
                 </div>
@@ -75,7 +72,7 @@
                         <div class="btn-group btn-group-xs hidden-xs block-options">
                             <ul class="list-nostyle list-horiz">
                                 <li title="{{ mix.plays.length }} Plays" class="stats-item bordered-right">
-                                    <span tooltip="tooltip" data-toggle="tooltip" title="Plays"
+                                    <span uib-tooltip="Plays"
                                           class="btn btn-alt btn-sm btn-default non-url-button">
                                         <i class="fa fa-play-circle"></i>
                                         {{ mix.plays.length }}
@@ -83,16 +80,16 @@
                                 </li>
                                 <li title="{{ mix.downloads.length }} Downloads" class="stats-item bordered-right">
                                     <span ng-show="$root.currentUser">
-                                        <button ng-show="mix.is_downloadable" ng-click="downloadFile()" tooltip="tooltip"
-                                                data-toggle="tooltip" title="Download"
+                                        <button ng-show="mix.is_downloadable" ng-click="downloadFile()"
+                                                uib-tooltip="Download"
                                                 class="btn btn-alt btn-sm btn-default">
                                             <i class="fa fa-download"></i>
                                             {{ mix.downloads.length }}
                                         </button>
                                     </span>
                                     <span ng-show="!$root.currentUser">
-                                        <span ng-show="mix.is_downloadable" tooltip="tooltip" data-toggle="tooltip"
-                                              ng-click="login()" title="Login to download" class="btn btn-alt btn-sm btn-default">
+                                        <span ng-show="mix.is_downloadable" uib-tooltip="Login to download"
+                                              ng-click="login()" class="btn btn-alt btn-sm btn-default">
                                             <i class="fa fa-download"></i>
                                             {{ mix.downloads.length }}
                                         </span>
@@ -102,9 +99,7 @@
                                     class="stats-item bordered-right">
                                     <a ng-click="toggleLike()"
                                        ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
-                                       tooltip="tooltip" data-toggle="tooltip"
-                                       ng-attr-title="{{mix.is_liked ? 'Unlike' : 'Like'}}"
-                                       data-placement="top"
+                                       uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
                                        class="btn btn-alt btn-sm btn-default"><i
                                             class="fa fa-heart"></i>{{ mix.likes.length }}
                                     </a>
diff --git a/client/app/services/audio/audio.service.js b/client/app/services/audio/audio.service.js
index 4d6f7e8..5d737a3 100644
--- a/client/app/services/audio/audio.service.js
+++ b/client/app/services/audio/audio.service.js
@@ -17,7 +17,7 @@ angular.module('dssWebApp')
         });
 
         function _getStoredVolume() {
-            return  Math.round(localStorage.getItem(AUDIO_CONSTANTS.volume) || 50);
+            return Math.round(localStorage.getItem(AUDIO_CONSTANTS.volume) || 50);
         }
 
         function _setStoredVolume(volume) {
diff --git a/client/app/views/mixes/mixes.directive.html b/client/app/views/mixes/mixes.directive.html
index ab39ebe..835301d 100755
--- a/client/app/views/mixes/mixes.directive.html
+++ b/client/app/views/mixes/mixes.directive.html
@@ -29,18 +29,17 @@
             <div class="row">
                 <div class="btn-group mix-tools" role="group" aria-label="Default button group">
                     <button ng-click="shareFacebook()" type="button" class="btn"
-                            title="Share to facebook" data-toggle="tooltip">
+                            uib-tooltip="Share to facebook">
                         <i class="fa fa-2x fa-facebook-square"></i></button>
                     <button ng-click="shareTwitter()" type="button" class="btn"
-                            title="Share to twitter" data-toggle="tooltip">
+                            uib-tooltip="Share to twitter">
                         <i class="fa fa-2x fa-twitter-square"></i></button>
                     <!--
                     <button type="button" class="btn" title="Add to" data-toggle="tooltip">
                         <i class="glyphicon glyphicon-plus"></i></button>
                     -->
                     <button ng-click="toggleLike()" type="button" class="btn"
-                            tooltip="tooltip" data-toggle="tooltip"
-                            ng-attr-title="{{mix.is_liked ? 'Unlike' : 'Like'}}">
+                            uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}">
                         <i class="fa fa-2x"
                            ng-class="mix.is_liked ? 'fa-heart' : 'fa-heart-o'"
                            ng-style="{'color': mix.is_liked ? 'red' : ''}">
diff --git a/client/app/views/mixes/mixes.directive.js b/client/app/views/mixes/mixes.directive.js
index 52cc89b..9d66841 100755
--- a/client/app/views/mixes/mixes.directive.js
+++ b/client/app/views/mixes/mixes.directive.js
@@ -31,12 +31,23 @@ angular.module('dssWebApp')
                             break;
                         case PLAYSTATES.stopped:
                         default:
-                            AudioService.stop();
-                            AudioService.play(mix).then(function () {
-                                $scope.playingId = mix.slug;
-                                _addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
+                            var d = soundManager.creindeateSound({
+                                url: 'assets/fuckyouchrome.mp3',
+                                onfinish: function () {
+                                    $scope.mix.getStreamUrl().then(function (response) {
+                                        AudioService.play($scope.mix, response.data.url).then(function () {
+                                            $scope.playingId = $scope.mix.slug;
+                                            _addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
+                                            $scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
+                                                .then(function (response) {
+                                                    $scope.mix.plays.push(response);
+                                                });
+                                        });
+                                        $scope.playState = 1;
+                                    });
+                                }
                             });
-                            $scope.playState = 1;
+                            d.play();
                             break;
                     }
                     event.stopPropagation();
diff --git a/client/app/views/mixes/upload/upload.controller.js b/client/app/views/mixes/upload/upload.controller.js
index ae1e343..2bf1606 100755
--- a/client/app/views/mixes/upload/upload.controller.js
+++ b/client/app/views/mixes/upload/upload.controller.js
@@ -105,7 +105,7 @@ angular.module('dssWebApp')
                     $scope.mix = result;
                     $timeout(function () {
                         $scope.waveformFooter = "Waveform processing is taking longer than expected.<br />" +
-                            "Your mix should be available <a href='/mix/" + $scope.mix.slug + "'>Here</a>";
+                            "Your mix should be available <a ui-sref='root.user.mix({user: currentUser.slug, mix: mix.slug})'>Here</a>";
                         $scope.$apply();
                     }, 120000);
 
diff --git a/client/app/views/templates/searchResult.html b/client/app/views/templates/searchResult.html
index 62f793e..bc68692 100644
--- a/client/app/views/templates/searchResult.html
+++ b/client/app/views/templates/searchResult.html
@@ -1,4 +1,4 @@
-<a ui-sref="root.user.mix({user: match.model.user, mix: match.model.slug})">
+<a ui-sref="root.user.mix({user: match.model.user, mix: match.model.slug})" class="navbar-search main-search-result">
     <div class="widget">
         <div class="widget-simple">
             <div href="javascript:void(0)" class="widget-icon pull-left animation-fadeIn themed-background">
diff --git a/client/assets/fuckyouchrome.mp3 b/client/assets/fuckyouchrome.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..5dd10c654bf97d7bebcd18fac68aaf8ae6131257
GIT binary patch
literal 1410
zcmd6m>sQiu0EfSbfC$D9yy1o=DtIXqwT_y&rJ@#KXlgkvvuQT1&aB*`@&Goxq-<Gc
zqM0a`vvu+0spedTCc)7*qg=}_MlLJ!IMYN+#ou>y_F}L0X0P`73!d|w=L6?CT7cDU
zV@v?W)73pqDjD+8T?Pq4IB8x2q3+YLW%|l-206cZ;_@1~9F+_KQbYF3XN6Xt47`(e
z#<M28blv!Xd<%rqc?d5&K|l7rM9#mFv@<$8Z9MvY{&W~FrS`2;RAkRl+9m7C9rj~Y
zRS9Qu4SrYrV)!ga1W<ifwH<r%z;q|uD1H59|J**vA1{gBwd_J9oDb9@GQw_W>}4t-
z*05TBTx`Ic#iqC9B5jUJ9X^UF_u<px`?T9LsXUcSVd?1@CPP7p>_RdSU=F>#e?Trd
zM;~c^GvL0Yk6Yo4kEIpTh4mcDu)4f_&Cu#s+MRo=y9*8oyA{_LDps=kmwTqWcI5>H
zp|^u0V(?{I8+5s_dA@B>xlog%3W9$=m>nkV)~6VQGegrpz+q*C<5Q_F$7C3vlRg4(
z12E=r9p>WSsYWT-R?scv8{%)e=9h(=a%SQMbs`h*t2((`2b7pkBx)9R7#j&)6!dCc
z9$?}Dri5;dC>sl})dE)Kv+QWB_?o=|X9R<;H#ff*m3;AnCDrHE&~%<h(D3#C&I*AB
z-5lu8)gFN84{X+N4(S3k$;~m2V`EL@Me07lSp%E3e#CZ~j7Va)V4WJkYG9d_x~4!A
z_wZ}<GCJ6i*pZ+)IsN&Yq^u<N$Q35NiD0{GG);Y~d@;h?=j47%nnZOFJ&CC`*DD){
zs;mif@<@X3PqNPSd&!EfMsuGqUg$pis^^|KjSVkNc~MEWn$cN>BDd{(Gn`?c*ygc3
z7CvqrKK+g9xW!uNuCPptAUkMD4kxo|pH6Y9lwpXDXJfq$R;kP0)jf*V>}dCQ3F+-X
zJXgf!AI80D5(&I3`aTIZsXfk5kvX*%b-K)+>sO~+CB^o83Mr4GihA9E8+H-Lh8Ylr
z-M<0|ygGj=!%vF68b~)V9bxjHCsd2>_VVF(LxC*C+9l=#r_=rE)l&0)kL}88=^q;i
z(icgNv(l00Ltd{gYBV3j;egG<AV7Bjm__zJUbH-5IfG@RYK<Vyy*SZiKJ0M8j(aef
zka?RqmK^KWf1f~$xHqG1=`Y6J+L$*yDQq?GIzrh8^|fpAL%P>-y6w2n0d_Jq;E?FC
z{kKjFLifH9w$mOw|1jmHumcg*7t~bQokA4_`VcXLIA=XZc4M!smlQwUnjvj^2HL9r
z&&fSd8E1^|EPnn@&M&}<{!elcaxP|_Sw&Yirv?;7Zrhqkr0*@WW$=XOk^S;PEKXlm
zf{SXzaAFV#BH0-U)+41M!9y74@uwnTy!D+nvBcNpUA3t*!zZ*jCc}VkXM3}$1yjSX
zxqg+>f!WH^qM|Kht;*k5ewK(z=j{c7N2@(7H+{Q4Vvg_ougN){TzbyE0sQymm;gCM
zrXx0ZtPGH^(MR8dgkbR|!>{7yvW=Z;-ckuEikfv04W#mV!=aW>rIf~M&>THieh|*Z
UF&C?;uFw~;y)TT2i%w4d3#9pp_y7O^

literal 0
HcmV?d00001

diff --git a/client/index.html b/client/index.html
index 1bd46f6..520fc9f 100644
--- a/client/index.html
+++ b/client/index.html
@@ -45,6 +45,7 @@
     <!-- endbuild -->
 </head>
 <body class="theme-lightgrey" data-theme="theme-lightgrey" ng-controller="MainCtrl">
+
 <div id="navigation" ui-view="navbar">
 </div>
 <div id="main">
@@ -58,10 +59,9 @@
      style="position: fixed; bottom: 0px; top: auto;">
 </div>
 <div id="spoon-plugin-kncgbdglledmjmpnikebkagnchfdehbm-2" style="display:none"></div>
+
 </body>
-
 <script src="//connect.facebook.net/en_US/sdk.js"></script>
-
 <!--[if lt IE 9]>
 <script src="bower_components/es5-shim/es5-shim.js"></script>
 <script src="bower_components/json3/lib/json3.min.js"></script>
@@ -77,7 +77,9 @@
 <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
 <script src="bower_components/angular-translate/angular-translate.js"></script>
 <script src="bower_components/angular-dialog-service/dist/dialogs.min.js"></script>
+<script src="bower_components/angular-dialog-service/dist/dialogs.js"></script>
 <script src="bower_components/angular-dialog-service/dist/dialogs-default-translations.min.js"></script>
+<script src="bower_components/angular-dialog-service/dist/dialogs-default-translations.js"></script>
 <script src="bower_components/angular-jwt/dist/angular-jwt.js"></script>
 <script src="bower_components/angular-loading-bar/build/loading-bar.js"></script>
 <script src="bower_components/angular-mocks/angular-mocks.js"></script>

From c04e67cb33eba00ef172a17b3681275efc42fc27 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 16 Dec 2015 22:43:07 +0000
Subject: [PATCH 5/6] Fixed chrome FUCK YOUz webz web url

---
 client/app/directives/audio/audio.player.directive.js | 2 +-
 client/app/views/mixes/mixes.directive.js             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/app/directives/audio/audio.player.directive.js b/client/app/directives/audio/audio.player.directive.js
index a574613..dafb69f 100644
--- a/client/app/directives/audio/audio.player.directive.js
+++ b/client/app/directives/audio/audio.player.directive.js
@@ -96,7 +96,7 @@ angular.module('dssWebApp')
                         default:
                             AudioService.stop();
                             var d = soundManager.createSound({
-                                url: 'assets/fuckyouchrome.mp3',
+                                url: 'https://dsscdn2.blob.core.windows.net/assets/fuckyouchrome.mp3',
                                 onfinish: function () {
                                     $scope.mix.getStreamUrl().then(function (response) {
                                         AudioService.play($scope.mix, response.data.url).then(function () {
diff --git a/client/app/views/mixes/mixes.directive.js b/client/app/views/mixes/mixes.directive.js
index 9d66841..2aef8fa 100755
--- a/client/app/views/mixes/mixes.directive.js
+++ b/client/app/views/mixes/mixes.directive.js
@@ -32,7 +32,7 @@ angular.module('dssWebApp')
                         case PLAYSTATES.stopped:
                         default:
                             var d = soundManager.creindeateSound({
-                                url: 'assets/fuckyouchrome.mp3',
+                                url: 'https://dsscdn2.blob.core.windows.net/assets/fuckyouchrome.mp3',
                                 onfinish: function () {
                                     $scope.mix.getStreamUrl().then(function (response) {
                                         AudioService.play($scope.mix, response.data.url).then(function () {

From b331beb40796c67f0fa92d00a8aa236f8a7b6369 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Thu, 17 Dec 2015 20:21:59 +0000
Subject: [PATCH 6/6] Navbar fixes

---
 client/app/components/navbar/navbar.html           | 11 +++++++----
 client/app/components/navbar/navbar.less           | 11 ++++++-----
 .../directives/notifications/notifications.less    | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index b3b35d3..ea25ac7 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -19,7 +19,7 @@
                     <span>Upload</span>
                 </a>
             </li>
-        </ul>n
+        </ul>
         <div class="col-sm-6 col-md-6">
             <form class="navbar-form" role="search">
                 <div class="input-group">
@@ -47,9 +47,11 @@
             </li>
 
             <li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
-                <a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{ $root.currentUser.display_name }}
+                <a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{
+                    $root.currentUser.display_name }}
                     <b class="caret"></b>
-                    <img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}" alt="">
+                    <img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}"
+                         alt="">
                 </a>
                 <ul class="dropdown-menu">
                     <li>
@@ -81,7 +83,8 @@
                                             class="fa fa-twitter"></i> Twitter</a>
                                 </li>
                                 <li>
-                                    <a ng-click="doLogin('google')" class="btn btn-google"><i class="fa fa-google"></i>
+                                    <a ng-click="doLogin('google')" class="btn btn-google"><i
+                                            class="fa fa-google"></i>
                                         Google</a>
                                 </li>
                             </ul>
diff --git a/client/app/components/navbar/navbar.less b/client/app/components/navbar/navbar.less
index aac13ab..b9c7cef 100644
--- a/client/app/components/navbar/navbar.less
+++ b/client/app/components/navbar/navbar.less
@@ -52,11 +52,12 @@ nav > div.collapse.navbar-collapse > ul > li > a {
 
 .notification-label {
   position: absolute !important;
-  top: 5px !important;;
-  font-size: 11px !important;;
-  font-weight: 400 !important;;
-  padding: 0 3px !important;;
-  line-height: 14px !important;;
+  top: 5px !important;
+  left: 22px !important;
+  font-size: 11px !important;
+  font-weight: 400 !important;
+  padding: 0 3px !important;
+  line-height: 14px !important;
 }
 
 #notifications-button {
diff --git a/client/app/directives/notifications/notifications.less b/client/app/directives/notifications/notifications.less
index fae44ac..4af91cf 100644
--- a/client/app/directives/notifications/notifications.less
+++ b/client/app/directives/notifications/notifications.less
@@ -4,5 +4,17 @@
 }
 
 .notification-new {
-  font-weight: bold!important;
+  font-weight: bold !important;
 }
+
+.notification-details-profile-image {
+  float: left;
+  width: 40px;
+}
+
+.notification-details {
+  margin-left: 10px;
+  padding-left: 15px;
+  max-width: 210px;
+  overflow: hidden;
+}
\ No newline at end of file