Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for blacklisting unverified devices, both per-room and globally #336

Merged
merged 6 commits into from
Feb 3, 2017
Merged

Support for blacklisting unverified devices, both per-room and globally #336

merged 6 commits into from
Feb 3, 2017

Commits on Jan 21, 2017

  1. track whether we blacklist unverified devices per-room & globally

    @ara4n
    ara4n committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    512d588 View commit details
    Browse the repository at this point in the history

  2. actually consider _crypto.getGlobalBlacklistUnverifiedDevices

    @ara4n
    ara4n committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    d37935d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2017

  1. make it work

    @ara4n
    ara4n committed Jan 22, 2017
    Configuration menu
    Copy the full SHA
    3d30ad8 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-un… 

    …verified
    @richvdh
    richvdh committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    c9b700e View commit details
    Browse the repository at this point in the history

  2. Fix lint

    @richvdh
    richvdh committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    85cf2a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. Merge branch 'develop' into matthew/blacklist-unverified

    @ara4n
    ara4n committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    b6f3fc5 View commit details
    Browse the repository at this point in the history