Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Merge develop -> experimental #2441

Merged
merged 4 commits into from
Jan 14, 2019
Merged

Merge develop -> experimental #2441

merged 4 commits into from
Jan 14, 2019

Commits on Jan 11, 2019

  1. Give a route for retrying invites for users which may not exist 

    Fixes element-hq/element-web#7922

This supports the current style of errors (M_NOT_FOUND) as well as the errors presented by MSC1797: matrix-org/matrix-spec-proposals#1797
    @turt2live
    turt2live committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    5333114 View commit details
    Browse the repository at this point in the history

  2. Appease the linter

    @turt2live
    turt2live committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    c351ee3 View commit details
    Browse the repository at this point in the history

  3. Rephrase everything to be "invite anyways" rather than "retry" 

    Also handle profile errors better
    @turt2live
    turt2live committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    a05c0f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2019

  1. Merge pull request #2434 from matrix-org/travis/invite-better 

    Give a route for retrying invites for users which may not exist
    @turt2live
    turt2live authored Jan 14, 2019
    Configuration menu
    Copy the full SHA
    a324035 View commit details
    Browse the repository at this point in the history