Merge branch 'master' into ux-improvements

Conflicts:
	views/bonfire/show.jade

app.js

@@ -144,7 +144,8 @@ var trusted = [
     'https://*.togetherjs.com',
     'wss://hub.togetherjs.com',
     '*.ytimg.com',
-    'wss://fcctogether.herokuapp.com'
+    'wss://fcctogether.herokuapp.com',
+    '*.bitly.com'
 ];
 
 app.use(helmet.contentSecurityPolicy({

views/bonfire/show.jade

@@ -94,6 +94,7 @@ block content
                     var challengeName = !{JSON.stringify(name)};
                     var started = Math.floor(Date.now() / 1000);
                     var _ = R;
+                    var dashed = !{JSON.stringify(dashedName)};
         .col-xs-12.col-sm-12.col-md-8
             #mainEditorPanel
                 form.code
@@ -128,7 +129,7 @@ block content
 
 
                         - if (points && points > 2)
-                            a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/bonfires/#{dashedName}&hashtags=LearnToCode, JavaScript" target="_blank")
+                            a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank")
                                 i.fa.fa-twitter  
                                     = phrase
                     - else
@@ -141,4 +142,15 @@ block content
                     a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
                 .modal-body
                     include ../partials/bonfires
+    script.
+        $.ajax({
+            url: 'https://api-ssl.bitly.com/v3/shorten?access_token=75e7931a19befaafcf108021b6d597e554b2c5c3&longUrl=http%3A%2F%2Ffreecodecamp.com%2Fbonfires%2F' + dashed + '&format=txt'
+        })
+                .success(
+                function (data) {
+                    console.log(data);
+                    url = "https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=" + data + "&hashtags=LearnToCode, JavaScript";
+                    $('.btn-twitter').attr('href', url);
+                }
+        );
 

views/challenges/show.jade

@@ -31,7 +31,7 @@ block content
                                 - if (cc)
                                     a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block.next-challenge-button(name='_csrf', value=_csrf, aria-hidden='true') Take me to my next challenge
                                     - if (points && points > 2)
-                                        a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=LearnToCode, JavaScript" target="_blank")
+                                        a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank")
                                           i.fa.fa-twitter  
                                              = phrase
                                 - else
@@ -43,3 +43,14 @@ block content
                                 a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
                             .modal-body
                                     include ../partials/challenges
+    script.
+        $.ajax({
+            url: 'https://api-ssl.bitly.com/v3/shorten?access_token=75e7931a19befaafcf108021b6d597e554b2c5c3&longUrl=http%3A%2F%2Ffreecodecamp.com%2Fchallenges%2F' + !{JSON.stringify(number)} + '&format=txt'
+        })
+                .success(
+                function (data) {
+                    console.log(data);
+                    url = "https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=" + data + "&hashtags=LearnToCode, JavaScript";
+                    $('.btn-twitter').attr('href', url);
+                }
+        );

views/resources/chat.jade

@@ -6,9 +6,9 @@ block content
                 a(href="http://github.com/join", target='_blank') here
                 | .
             li Download the chat room app on  
-                a(href="https://update.gitter.im/osx/latest") Windows
+                a(href="https://update.gitter.im/win/latest") Windows
                 | , 
-                a(href="https://update.gitter.im/win/latest") Mac
+                a(href="https://update.gitter.im/osx/latest") Mac
                 | , 
                 a(href="http://appstore.com/gitter") iPhone
                 | ,  or