Merge branch 'master' into production

.travis.yml

@@ -25,7 +25,7 @@ before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - "node index.js --unittest &"
-  - "sleep 10" # to give node a chance to start
+  - "sleep 15" # to give node a chance to start
 
 script:
   - "./node_modules/karma/bin/karma start --browsers Firefox --single-run --reporters progress"

app/core/services/stripe.coffee

@@ -7,7 +7,6 @@ if StripeCheckout?
     email: me.get('email')
     image: "https://codecombat.com/images/pages/base/logo_square_250.png"
     token: (token) ->
-      console.log 'trigger?', handler.trigger
       handler.trigger 'received-token', { token: token }
       Backbone.Mediator.publish 'stripe:received-token', { token: token }
     locale: 'auto'

app/core/social-handlers/FacebookHandler.coffee

@@ -39,7 +39,7 @@ module.exports = FacebookHandler = class FacebookHandler extends CocoClass
       @waitingForLogin = true
 
   fetchMeForLogin: ->
-    FB.api('/me', @onReceiveMeInfo)
+    FB.api('/me', {fields: 'email,last_name,first_name,gender'}, @onReceiveMeInfo)
 
   onReceiveMeInfo: (r) =>
     unless r.email

app/styles/sales-view.sass

@@ -147,8 +147,9 @@
     .teacher-quote
       font-family: Merriweather
       font-weight: 300
-      font-size: 18px
+      font-size: 15px
       line-height: 20px
+      padding-top: 5px
 
     .teacher-name
       font-family: Helvetica, sans-serif
@@ -178,7 +179,7 @@
       background-repeat: no-repeat
       background-size: 100% auto
       height: 265px
-      padding: 12px
+      padding: 20px 12px 12px 12px
       margin-left: 10px
 
       .teacher-quote

app/templates/sales-view.jade

@@ -102,13 +102,14 @@ block content
           td
             #quote1-container
               .teacher-quote
-                span.spr "My class had been struggling with the basics of Python all year. Today they were having fun and getting into it
+                span.spr “My class had been struggling with the basics of Python all year. Today they were having fun and getting into it
-                strong - I think they actually forgot that they were actually learning something."
+                strong - I think they forgot that they were actually learning something.”
               .row
                 .col-md-4
                 .col-md-8
                   .hero-quote-attribution
                     .teacher-name Tim M.
+                    a(href='https://twitter.com/timmaki',target='_blank') @timmaki
                     .teacher-location Director of Technology, Tilton School
           td
             #quote2-container
@@ -120,8 +121,8 @@ block content
                     .teacher-location.text-right Global Learning Charter Public School
                 .col-md-4
               .teacher-quote
-                span.spr "My girls, who were apprehensive about taking a coding class, are some of my top students.
+                span.spr “My girls, who were apprehensive about taking a coding class, are some of my top students.
-                strong They work together and explain the code to each other to make sure each understands."
+                strong They work together and explain the code to each other to make sure each understands.”
       br
 
       .text-center.section-subheader Students play CodeCombat during #HourOfCode 2015

app/views/core/SubscribeModal.coffee

@@ -201,13 +201,13 @@ module.exports = class SubscribeModal extends ModalView
       @state = 'unknown_error'
       @stateMessage = "Uknown problem occurred while processing Stripe request"
 
-  onSubscriptionSuccess: =>
+  onSubscriptionSuccess: ->
     application.tracker?.trackEvent 'Finished subscription purchase', value: @purchasedAmount
     Backbone.Mediator.publish 'subscribe-modal:subscribed', {}
     @playSound 'victory'
     @hide()
 
-  onSubscriptionError: (user, response, options) =>
+  onSubscriptionError: (user, response, options) ->
     console.error 'We got an error subscribing with Stripe from our server:', response
     application.tracker?.trackEvent 'Failed to finish subscription purchase', status: options.xhr?.status, value: @purchasedAmount
     stripe = me.get('stripe') ? {}