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

Handle terms agreement in Discovery section of user settings #3327

Merged
merged 7 commits into from
Aug 21, 2019
Merged

Handle terms agreement in Discovery section of user settings #3327

merged 7 commits into from
Aug 21, 2019

Commits on Aug 20, 2019

  1. Rename and export abbreviateIdentityUrl

    @turt2live
    turt2live committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    83af732 View commit details
    Browse the repository at this point in the history

  2. Support IS token handling without checking terms 

    This is so we can optionally do our own terms handling.
    @turt2live
    turt2live committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    525b4ca View commit details
    Browse the repository at this point in the history

  3. Add an inline terms agreement component 

    Handles agreement of terms in an inline way.
    @turt2live
    turt2live committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    417de0c View commit details
    Browse the repository at this point in the history

  4. Use new InlineTermsAgreement component on IS Discovery section 

    Fixes element-hq/element-web#10522
    @turt2live
    turt2live committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    3181829 View commit details
    Browse the repository at this point in the history

  5. Appease the linter 

    It really wants a trailing comma.
    @turt2live
    turt2live committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    7cd2fb3 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. We don't use reject

    @turt2live
    turt2live committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    c758b5d View commit details
    Browse the repository at this point in the history

  2. Move URL abbreviation to its own util file

    @turt2live
    turt2live committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    2dc28a6 View commit details
    Browse the repository at this point in the history