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

Prompt user to leave rooms/subspaces in a space when leaving space #6424

Merged
merged 9 commits into from
Jul 29, 2021
Merged

Prompt user to leave rooms/subspaces in a space when leaving space #6424

merged 9 commits into from
Jul 29, 2021

Commits on Jul 21, 2021

  1. Prompt user to leave rooms/subspaces in a space when leaving space

    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    1b2d70d View commit details
    Browse the repository at this point in the history

  2. remove duplicated content

    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    bc87dc3 View commit details
    Browse the repository at this point in the history

  3. don't force height if the height can't change (no children edge)

    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    880dc26 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. Merge branch 'develop' into t3chguy/fix/18071

    @t3chguy
    t3chguy authored Jul 27, 2021
    Configuration menu
    Copy the full SHA
    8dd11cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into t3chguy/fix/18071

    @t3chguy
    t3chguy committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    39d9ec3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 't3chguy/fix/18071' of github.com:matrix-org/matrix-reac… 

    …t-sdk into t3chguy/fix/18071
    @t3chguy
    t3chguy committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    62033d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2021

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

    … t3chguy/fix/18071

� Conflicts:
�	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
�	src/utils/space.tsx
    @t3chguy
    t3chguy committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    493cd01 View commit details
    Browse the repository at this point in the history

  2. update copy

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

  3. Switch dropdown out for radio interaction when leaving space

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