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 warning users when unknown devices show up #335

Merged
merged 11 commits into from
Feb 2, 2017
Merged

Support for warning users when unknown devices show up #335

merged 11 commits into from
Feb 2, 2017

Commits on Jan 21, 2017

  1. experimental support for warning users when unknown devices show up i… 

    …n a room.

hopefully a step towards fixing element-hq/element-web#2143
    @ara4n
    ara4n committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    fb820fa View commit details
    Browse the repository at this point in the history

  2. oops, unbreak it

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

  3. fix lint

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

  4. some incoherent jottings on the warning semantics

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

Commits on Jan 25, 2017

  1. Address my own review comments

    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    4ccd649 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into matthew/warn-unkno… 

    …wn-devices
    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    5245c7f View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    085493d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'matthew/warn-unknown-devices' of git+ssh://github.com/m… 

    …atrix-org/matrix-js-sdk into matthew/warn-unknown-devices
    @ara4n
    ara4n committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    dfae72e View commit details
    Browse the repository at this point in the history

  5. don't automatically mark devices as known; require the app to do it

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

Commits on Jan 26, 2017

  1. Store device 'known' status in session store

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

Commits on Feb 1, 2017

  1. Merge branch 'develop' into matthew/warn-unknown-devices

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