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

very barebones support for warning users when rooms contain unknown devices #635

Merged
merged 12 commits into from
Feb 2, 2017
Merged

very barebones support for warning users when rooms contain unknown devices #635

merged 12 commits into from
Feb 2, 2017

Commits on Jan 21, 2017

  1. very barebones support for warning users when rooms contain unknown d… 

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

Commits on Jan 25, 2017

  1. Revert accidental change 

    This was an unrelated change which is being done on another branch anyway
    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    21f3aea View commit details
    Browse the repository at this point in the history

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

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

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

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

  4. Refactor UnknownDeviceDialog 

    hopefully make this a bit more readable, and use our new BaseDialog.
    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    5da6ca8 View commit details
    Browse the repository at this point in the history

  5. Factor out common onSendMessageFailed

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

  6. explicitly set device known-ness

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

  7. Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/… 

    …matrix-react-sdk into matthew/warn-unknown-devices
    @richvdh
    richvdh committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    60d7575 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. UnknownDeviceDialog: Reword the warning

    @richvdh
    richvdh committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    2c7b3d9 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
    c09d173 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. support scrollable content for UnknownDeviceDialog

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

  2. fix copyright & always show gemini

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