1. 13 May, 2016 8 commits
    • Robert Knight's avatar
      Display the total number of visible annotations and replies in the search result count · ad776c90
      Robert Knight authored
      Make the behavior of the new threading implementation consistent with that of
      the previous threading implementation by displaying the total number of visible
      annotations (+ replies) as the search result count.
      ad776c90
    • Robert Knight's avatar
      Reset expanded threads when filter query changes. · 936650cc
      Robert Knight authored
      As noted in https://github.com/hypothesis/h/pull/3284#issuecomment-219031557
      threads which have been explicitly collapsed need to have their
      expansion state reset when the filter query changes.
      
      This commit resolves this by moving the search query and sort UI state
      into the annotationUI Redux store and handles the state update
      in a SET_FILTER_QUERY action.
      
      This means that the rootThread module no longer maintains any primary
      state of its own, just state derived from the current annotationUI
      state.
      936650cc
    • Robert Knight's avatar
      Only show replies that match the search filter or contain at least one visible descendant · 6462e0e0
      Robert Knight authored
      Given a thread like this:
      
          A-
           |- B
              |- C
              |- D
           |- E
      
      Where only 'B' matches the search filter, the rendered output should be:
      
          View 4 more in conversation
           |- B
              View two more in conversation
      6462e0e0
    • Robert Knight's avatar
      Only filter annotations (not replies) against selection · e27a7962
      Robert Knight authored
      Only annotations, not replies can be selected, so only filter top-level
      annotations against the selection map.
      
      This resulted in an issue where 'View N more in conversation' being
      shown where 'N' was the number of replies when selecting an annotation
      with replies in the page.
      
      See https://github.com/hypothesis/h/pull/3285#issuecomment-218734287
      e27a7962
    • Robert Knight's avatar
      Render annotation thread using new threading infrastructure · b005ed0d
      Robert Knight authored
      This replaces the rendering of conversation threads using
      the new threading implementation.
      
       * Add <annotation-thread> component to render Thread objects
         generated by rootThread.
      
       * Expose the Thread generated by the `rootThread` service on
         the scope so that <annotation-thread> can render it.
      
       * Remove logic and tests in <annotation> for updating reply
         counts and thread states as these are no longer needed.
      b005ed0d
    • Robert Knight's avatar
      Add rootThread module for building conversation thread from loaded annotations · de829f34
      Robert Knight authored
      This adds a service that listens for changes in the UI state and
      the set of loaded annotations and generates a thread structure in
      response, which can then be visualized by a view.
      
      This commit also adds a first integration test which wires together
      the non-visual parts of the new threading implementation.
      
       * Add 'annotations' to the UI state in annotationUI and update
         this when annotations are loaded or unloaded.
      
       * Add rootThread which listens for changes in the UI state and
         generates a new conversation thread structure in response.
      
       * Add an integration test which tests the wiring of the non-visual
         parts of the new threading implementation.
      de829f34
    • Robert Knight's avatar
      Add rootThread module for building conversation thread from loaded annotations (#3283) · 8b5eb489
      Robert Knight authored
      This adds a service that listens for changes in the UI state and
      the set of loaded annotations and generates a thread structure in
      response, which can then be visualized by a view.
      
      This commit also adds a first integration test which wires together
      the non-visual parts of the new threading implementation.
      
       * Add 'annotations' to the UI state in annotationUI and update
         this when annotations are loaded or unloaded.
      
       * Add rootThread which listens for changes in the UI state and
         generates a new conversation thread structure in response.
      
       * Add an integration test which tests the wiring of the non-visual
         parts of the new threading implementation.
      8b5eb489
    • Christof Dorner's avatar
      Merge pull request #3311 from hypothesis/move-celery-command-to-cli · b22395fe
      Christof Dorner authored
      Move hypothesis-celery command to h.cli
      b22395fe
  2. 12 May, 2016 7 commits
  3. 11 May, 2016 4 commits
  4. 10 May, 2016 7 commits
  5. 09 May, 2016 14 commits