Merge branch 'master' of git.rrerr.net:justask/justask

app/assets/javascripts/application.js.erb.coffee

@@ -30,4 +30,4 @@ _ready = ->
   sweetAlertInitialize()
 
 $(document).ready _ready
-$(document).on 'page:load', _ready
+$(document).on 'page:load', _ready

app/assets/javascripts/inbox.coffee

@@ -57,7 +57,7 @@
 
 $(document).on "keydown", "textarea[name=ib-answer]", (evt) ->
   iid = $(this)[0].dataset.id
-  if evt.keyCode == 13 and evt.ctrlKey
+  if evt.keyCode == 13 and (evt.ctrlKey or evt.metaKey)
     # trigger warning:
     $("button[name=ib-answer][data-ib-id=#{iid}]").trigger 'click'
 
@@ -120,4 +120,4 @@ $(document).on "click", "button[name=ib-destroy]", ->
         showNotification "An error occurred, a developer should check the console for details", false
       complete: (jqxhr, status) ->
         btn.button "reset"
-        $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly"
+        $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly"

app/assets/javascripts/questionbox/all.coffee

@@ -22,8 +22,12 @@ $(document).on "click", "button[name=qb-all-ask]", ->
       btn.button "reset"
       $("textarea[name=qb-all-question]").removeAttr "readonly"
 
+# hotkey for accessing this quickly
+$(document).on "keydown", (evt) ->
+  if evt.keyCode == 77 and (evt.ctrlKey or evt.metaKey)
+    $('.btn[name=toggle-all-ask]').trigger 'click'
 
 # see GitHub issue #2
 ($ document).on "keydown", "textarea[name=qb-all-question]", (evt) ->
-  if evt.keyCode == 13 and evt.ctrlKey
-    ($ "button[name=qb-all-ask]").trigger 'click'
+  if evt.keyCode == 13 and (evt.ctrlKey or evt.metaKey)
+    ($ "button[name=qb-all-ask]").trigger 'click'

app/views/layouts/_header.html.haml

@@ -25,7 +25,7 @@
           = render "layouts/notifications"
         %ul.nav.navbar-nav.navbar-right
           %li
-            .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
+            .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
               %i.fa.fa-pencil-square-o
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}

app/views/layouts/application.html.haml

@@ -1,5 +1,5 @@
 !!! 5
-%html
+%html{lang: 'en'}
   %head
     %meta{charset: 'utf-8'}
     %meta{'http-equiv' => 'X-UA-Compatible' ,content: 'IE=edge'}
@@ -42,4 +42,4 @@
         })();
       %noscript
         %p
-          %img{:alt => "", :src => "//stat.rrerr.net/piwik.php?idsite=9", :style => "border:0;"}/
+          %img{:alt => "", :src => "//stat.rrerr.net/piwik.php?idsite=9", :style => "border:0;"}/

app/views/shared/_comments.html.haml

@@ -25,7 +25,8 @@
                         %a{href: '#', data: { action: 'ab-comment-report', c_id: comment.id }}
                           %i.fa.fa-exclamation-triangle
                           Report
-            %p.comments--content= comment.content
+            .comments--content
+              = markdown comment.content
 - if user_signed_in?
   .form-group.has-feedback{name: 'ab-comment-new-group', data: { a_id: a.id }}
     %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'ab-comment-new', data: {a_id: a.id }}

app/views/shared/_links.html.haml

@@ -3,4 +3,7 @@
   = Date.today.year
   = APP_CONFIG['site_name']
   ·
-  = link_to "About", about_path
+  = link_to "About", about_path
+  ·
+  = link_to "Bugs", 'https://github.com/retrospring/bugs/issues'
+

app/views/user/_profile_info.html.haml

@@ -25,7 +25,7 @@
       .profile--username
         = @user.screen_name
     - unless @user.bio.blank?
-      %p.profile--text= @user.bio
+      %p.profile--text= markdown @user.bio
     - unless @user.website.blank?
       %p.profile--text
         %i.fa.fa-globe