Skip to content
Snippets Groups Projects
  1. Nov 18, 2016
  2. Nov 17, 2016
  3. Nov 16, 2016
  4. Nov 14, 2016
    • akwizgran's avatar
      Merge branch '732-reveal-contacts-ui-onboarding' into 'master' · c4a152b5
      akwizgran authored
      Add onboarding dialog for revealing contacts screen
      
      This MR is based on !406.
      
      ![device-2016-11-11-162417](/uploads/8df831905eebf41ecdbe368890cdd429/device-2016-11-11-162417.png)
      
      See merge request !407
      c4a152b5
    • Torsten Grote's avatar
      ed728e81
    • akwizgran's avatar
      Merge branch '732-reveal-contacts-ui' into 'master' · efbce953
      akwizgran authored
      Add UI for revealing contacts within a private group
      
      This addresses one part of #732. Join notices and onboarding will follow in separate MRs.
      
      Although this MR is technically not based on !402, it does require it to be merged first to compile.
      
      ![device-2016-11-11-160454](/uploads/8cb6d8bdd0f3761657875024739e730a/device-2016-11-11-160454.png)
      
      See merge request !406
      efbce953
    • akwizgran's avatar
      Merge branch '709-reveal-relationships' into 'master' · 98c81f71
      akwizgran authored
      Mark relationship visible when syncing group with peer
      
      This branch updates the private group invitation protocol to use @grote's new method for marking a contact relationship visible to the group.
      
      I've changed the method slightly because the protocol state machine allows us to leave and re-enter the BOTH_JOINED state (see diagram on #659), so the relationship may already be visible when the method is called. In that case the visibility isn't updated, so we stick with whichever of revealed-by-us and revealed-by-contact happened first.
      
      See merge request !402
      98c81f71
Loading