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

Add a button to un-ban users in RoomSettings #698

Merged
merged 7 commits into from
Feb 17, 2017
Merged

Add a button to un-ban users in RoomSettings #698

merged 7 commits into from
Feb 17, 2017

Commits on Feb 14, 2017

  1. Merge remote-tracking branch 'origin/develop' into dbkr/missed_access… 

    …iblebuttons
    @dbkr
    dbkr committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    e1cb34e View commit details
    Browse the repository at this point in the history

  2. Add a button to un-ban users in RoomSettings 

    element-hq/element-web#3091
    @dbkr
    dbkr committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    87516fb View commit details
    Browse the repository at this point in the history

  3. Copyright

    @dbkr
    dbkr committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    431e7a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. Merge branch 'develop' into dbkr/add_unban_button

    @richvdh
    richvdh committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    42bb269 View commit details
    Browse the repository at this point in the history

  2. Fix docs & use WithMatrixClient

    @dbkr
    dbkr committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    c082827 View commit details
    Browse the repository at this point in the history

  3. Revert c082827 

    Revert the WithMatrixClient change: RoomView calls methods on
the RoomSettings component and this breaks when RoomSettings is
wrapped in a WithMatrixClient.
    @dbkr
    dbkr committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    a5a0562 View commit details
    Browse the repository at this point in the history

  4. Fix docs & add MatrixClient check 

    Addresses PR feedback without breaking RoomSettings
    @dbkr
    dbkr committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    8698d40 View commit details
    Browse the repository at this point in the history