Merge branch 'master' into syncbridge

Conflicts:
	h/static/scripts/controllers.coffee

h/static/images/sad-annotation.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="99px" height="92px" viewBox="0 0 99 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="sad-annotation" sketch:type="MSLayerGroup" fill="#BBBBBB">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="Group">
+                    <path d="M21.0244225,0.305107567 C9.98135502,0.305107567 0.872083773,9.25959265 0.678248468,20.308205 L0.098944476,53.3285326 C-0.0948696585,64.3759382 8.70465419,73.4690154 19.7517133,73.6315189 C19.7517133,73.6315189 30.5058053,73.8128632 30.9230781,73.7586857 C40.8912967,75.3957845 45.7862251,91.741397 49.2864726,91.6950246 C53.1354048,91.6484543 57.3386431,73.6047617 68.0769228,73.33163 C74.7294766,73.4808984 77.9774076,73.3977824 77.9774076,73.3977824 C89.0194649,73.3612475 98.1279171,64.3771449 98.3217525,53.3285326 L98.9010564,20.308205 C99.0948706,9.26079934 90.2968029,0.305107567 79.2567454,0.305107567 L21.0244225,0.305107567 L21.0244225,0.305107567 Z M26.0106513,10.1273884 C17.7255158,10.1273884 10.8879947,16.8334308 10.7382361,25.127031 L10.331435,47.6555952 C10.1818484,55.9396691 16.7756859,62.7583236 25.0571713,62.8806623 C25.0571713,62.8806623 34.35,63.0352771 34.6795201,62.9924921 C42.5514181,64.2853411 47.5044818,74.576174 49.318091,74.6127971 C51.1317002,74.6494202 55.5398805,62.8709353 64.0198953,62.6552378 C69.2734142,62.773118 77.6243098,62.6999126 77.6243098,62.6999126 C83.1486949,62.6752394 87.7079626,58.1767429 87.8077324,52.651511 L88.3047454,25.127031 C88.4543319,16.8429571 81.8615115,10.1273884 73.574031,10.1273884 L26.0106513,10.1273884 L26.0106513,10.1273884 Z" id="Active-Browser-Action-2"></path>
+                    <ellipse id="Oval-1" cx="32.2042451" cy="28.4907829" rx="5.12466824" ry="6.83289099"></ellipse>
+                    <path d="M66.3687001,35.3236739 C69.1989762,35.3236739 71.4933683,32.2644844 71.4933683,28.4907829 C71.4933683,24.7170814 69.1989762,21.6578919 66.3687001,21.6578919 C63.538424,21.6578919 61.2440318,24.7170814 61.2440318,28.4907829 C61.2440318,32.2644844 63.538424,35.3236739 66.3687001,35.3236739 L66.3687001,35.3236739 Z" id="Oval-2"></path>
+                    <path d="M49.2864724,49.7403396 C52.0318666,49.8681341 53.5761511,50.4824633 54.686705,50.8198538 C55.7880507,51.3905335 56.7456419,52.2736067 57.4129402,53.4294012 C58.1538299,54.7126599 59.7893503,55.1554407 61.0659771,54.4183798 C62.3426039,53.681319 62.7769046,52.0435264 62.0360149,50.7602678 C59.3856696,46.169735 54.2624995,44.2918433 49.2864724,44.2918433 C44.1388577,44.2918433 39.1872757,46.169735 36.5369303,50.7602678 C35.7960406,52.0435264 36.2303413,53.681319 37.5069681,54.4183798 C38.783595,55.1554407 40.4191153,54.7126599 41.160005,53.4294012 C41.8273033,52.2736067 42.7848945,51.3905335 43.8862402,50.8198538 C43.8862402,50.8198538 46.7126649,49.8681341 49.2864724,49.7403396 L49.2864724,49.7403396 Z" id="Oval-1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

h/static/scripts/account/account-controller.coffee

@@ -87,5 +87,5 @@ class AccountController
 
 
 
-angular.module('h.account')
+angular.module('h')
 .controller('AccountController', AccountController)

h/static/scripts/account/account.coffee

-imports = [
-  'ngRoute'
-  'h.identity'
-  'h.helpers'
-  'h.session'
-]
-
 AUTH_SESSION_ACTIONS = [
   'login'
   'logout'
@@ -126,6 +119,7 @@ configure = [
 ]
 
 
-angular.module('h.account', imports, configure)
+angular.module('h')
+.config(configure)
 .controller('AuthAppController', AuthAppController)
 .controller('AuthPageController', AuthPageController)

h/static/scripts/account/auth-controller.coffee

@@ -53,5 +53,5 @@ class AuthController
         , 300000
 
 
-angular.module('h.account')
+angular.module('h')
 .controller('AuthController', AuthController)

h/static/scripts/app.coffee

@@ -3,7 +3,6 @@ imports = [
   'ngRoute'
   'ngSanitize'
   'ngTagsInput'
-  'h.account'
   'h.helpers'
   'h.identity'
   'h.session'

h/static/scripts/controllers.coffee

@@ -202,7 +202,7 @@ class ViewerController
       streamfilter.resetFilter().addClause('/uri', 'one_of', loaded)
 
       if auth.user and annotationUI.tool is 'highlight'
-        streamfilter.addClause('/user', auth.user)
+        streamfilter.addClause('/user', 'equals', auth.user)
 
       streamer.send({filter: streamfilter.getFilter()})
 

h/static/styles/threads.scss

@@ -25,6 +25,10 @@ $threadexp-width: .6em;
   }
 }
 
+.thread-reply {
+  display: inline-block
+}
+
 .thread {
   @include pie-clearfix;
   cursor: pointer;

tests/js/account/account-controller-test.coffee

@@ -2,7 +2,7 @@ assert = chai.assert
 sinon.assert.expose assert, prefix: null
 sandbox = sinon.sandbox.create()
 
-describe 'h.account.AccountController', ->
+describe 'AccountController', ->
   $scope = null
   fakeFlash = null
   fakeSession = null
@@ -14,7 +14,7 @@ describe 'h.account.AccountController', ->
   profilePromise = null
   createController = null
 
-  beforeEach module('h.account')
+  beforeEach module('h')
 
   beforeEach module ($provide, $filterProvider) ->
     fakeSession = {}

tests/js/account/auth-controller-test.coffee

@@ -19,8 +19,13 @@ class MockSession
 mockFlash = sandbox.spy()
 mockFormHelpers = applyValidationErrors: sandbox.spy()
 
-describe 'h.account', ->
-  beforeEach module('h.account')
+describe 'AuthController', ->
+  $scope = null
+  $timeout = null
+  auth = null
+  session = null
+
+  beforeEach module('h')
   beforeEach module('h.templates')
 
   beforeEach module ($provide) ->
@@ -30,15 +35,6 @@ describe 'h.account', ->
     $provide.value 'formHelpers', mockFormHelpers
     return
 
-  afterEach ->
-    sandbox.restore()
-
-  describe 'AuthController', ->
-    $scope = null
-    $timeout = null
-    auth = null
-    session = null
-
   beforeEach inject ($controller, $rootScope, _$timeout_, _session_) ->
     $scope = $rootScope.$new()
     $timeout = _$timeout_
@@ -46,6 +42,9 @@ describe 'h.account', ->
     session = _session_
     sandbox.spy session, 'login'
 
+  afterEach ->
+    sandbox.restore()
+
   describe '#submit()', ->
     it 'should call session methods on submit', ->