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

Allow options to cascade kicks/bans throughout spaces #6829

Merged
merged 10 commits into from
Oct 14, 2021
Merged

Allow options to cascade kicks/bans throughout spaces #6829

merged 10 commits into from
Oct 14, 2021

Commits on Sep 17, 2021

  1. Allow options to cascade kicks/bans throughout spaces

    @t3chguy
    t3chguy committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    1858c63 View commit details
    Browse the repository at this point in the history

  2. Add fallback warning

    @t3chguy
    t3chguy committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    d615952 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/18969

� Conflicts:
�	src/components/views/dialogs/LeaveSpaceDialog.tsx
�	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    6d0af83 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/18969
    @t3chguy
    t3chguy committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    207a114 View commit details
    Browse the repository at this point in the history

  2. Fix avatar getting chopped off

    @t3chguy
    t3chguy committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    2ac2358 View commit details
    Browse the repository at this point in the history

  3. Switch ConfirmUserActionDialog over to using a Field

    @t3chguy
    t3chguy committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    0f8069a View commit details
    Browse the repository at this point in the history

  4. Iterate title on confirm space action dialog

    @t3chguy
    t3chguy committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    886f8d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Update copy

    @t3chguy
    t3chguy committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    0697470 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Update copy

    @t3chguy
    t3chguy committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    6454aa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/18969

� Conflicts:
�	src/components/views/right_panel/UserInfo.tsx
    @t3chguy
    t3chguy committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    111ae75 View commit details
    Browse the repository at this point in the history