Merge branch 'hotfix/facebook_share_image'

README.md

@@ -1,2 +1,7 @@
 # dss.web
 Web UI for deepsouthsounds
+
+
+npm install
+bower install
+grunt serve

client/app/helpers/social.js

@@ -1,5 +1,7 @@
 var helpers = helpers || {};
-function _getLink(url){
+function _getLink(url) {
+    if (url.startsWith('http'))
+        return url;
     return window.location.protocol + "//" + (window.location.host + '/' + url).replace(/([^:]\/)\/+/g, '$1');
 }
 
@@ -34,7 +36,7 @@ helpers.social = {
             }
         });
     },
-    postToTwitter: function(mix){
+    postToTwitter: function (mix) {
         var url = "http://" + window.location.host + "/mixes/" + mix.slug;
         var text = mix.title;
         window.open("http://twitter.com/share?url=#{url}&text={#text}", "twitterwindow", "height=450, width=550, top=" +

client/index.html

@@ -74,11 +74,11 @@
 <![endif]-->
 <!-- build:js({client,node_modules}) app/vendor.js -->
 <!-- bower:js -->
-<script src="bower_components/jquery/dist/jquery.js"></script>
 <script src="bower_components/angular/angular.js"></script>
 <script src="bower_components/angular-animate/angular-animate.js"></script>
 <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
 <script src="bower_components/angular-cookies/angular-cookies.js"></script>
+<script src="bower_components/jquery/dist/jquery.js"></script>
 <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>

package.json

@@ -16,6 +16,7 @@
     "express-session": "~1.0.2",
     "grunt-injector": "^0.6.0",
     "grunt-up": "^1.0.7",
+    "grunt-wiredep": "^3.0.1",
     "jade": "~1.2.0",
     "jit-grunt": "^0.9.1",
     "lodash": "~3.10.1",
@@ -63,7 +64,6 @@
     "grunt-rev": "~0.1.0",
     "grunt-svgmin": "~0.4.0",
     "grunt-usemin": "~2.1.1",
-    "grunt-wiredep": "~1.8.0",
     "jit-grunt": "^0.5.0",
     "jshint-stylish": "~0.1.5",
     "mustache-express": "^1.2.1",