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

Implement more meta-spaces #7077

Merged
merged 31 commits into from
Nov 11, 2021
Merged

Implement more meta-spaces #7077

merged 31 commits into from
Nov 11, 2021

Commits on Nov 3, 2021

  1. Stop showing all favourites in Home

    @t3chguy
    t3chguy committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    5da56b9 View commit details
    Browse the repository at this point in the history

  2. Initial work to modularize meta spaces

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

Commits on Nov 4, 2021

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

    … t3chguy/fix/19529
    @t3chguy
    t3chguy committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    a891750 View commit details
    Browse the repository at this point in the history

  2. fix some tests

    @t3chguy
    t3chguy committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    102677c View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

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

    … t3chguy/fix/19529
    @t3chguy
    t3chguy committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    b8eddcf View commit details
    Browse the repository at this point in the history

  2. Fix SpaceWatcher tests

    @t3chguy
    t3chguy committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    2e187bd View commit details
    Browse the repository at this point in the history

  3. fix remaining tests

    @t3chguy
    t3chguy committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    3b7b4e4 View commit details
    Browse the repository at this point in the history

  4. Fix HOME_SPACE emit

    @t3chguy
    t3chguy committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    d4fdd6e View commit details
    Browse the repository at this point in the history

  5. r/SUGGESTED_ROOMS/UPDATE_SUGGESTED_ROOMS/g

    @t3chguy
    t3chguy committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    355bda0 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. More genericity

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    f443874 View commit details
    Browse the repository at this point in the history

  2. Update space store metaspace signature to be more usable

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    7ead3c8 View commit details
    Browse the repository at this point in the history

  3. Add some metaspace support and a favourites button

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    eedfadc View commit details
    Browse the repository at this point in the history

  4. fix invalid calls to setActiveSpace(null)

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    0f04942 View commit details
    Browse the repository at this point in the history

  5. stash

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    7c6cdcd View commit details
    Browse the repository at this point in the history

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

    … t3chguy/fix/19529
    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    c9e22d4 View commit details
    Browse the repository at this point in the history

  7. Unbreak things

    @t3chguy
    t3chguy committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    2aeb27f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Unbreak things

    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    e2ca3ac View commit details
    Browse the repository at this point in the history

  2. Unbreak things

    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    1b48c56 View commit details
    Browse the repository at this point in the history

  3. Fix SpaceWatcher for non-home metaspaces

    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    0b255f7 View commit details
    Browse the repository at this point in the history

  4. Add tests

    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    0d88e48 View commit details
    Browse the repository at this point in the history

  5. Initial SidebarUserSettingsTab.tsx

    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    1135826 View commit details
    Browse the repository at this point in the history

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

    …t-sdk into t3chguy/fix/19529

� Conflicts:
�	src/components/views/spaces/SpacePanel.tsx
�	src/components/views/spaces/SpaceTreeLevel.tsx
    @t3chguy
    t3chguy committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    4233add View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Fix bad merge

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    89e65ae View commit details
    Browse the repository at this point in the history

  2. mock dmroommap for SpaceWatcher tests

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    433244e View commit details
    Browse the repository at this point in the history

  3. remove redundant comment

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    9e56f89 View commit details
    Browse the repository at this point in the history

  4. Add icon from design

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    1825b89 View commit details
    Browse the repository at this point in the history

  5. Fix behaviour of the feature_space_metaspaces flag

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    37a343d View commit details
    Browse the repository at this point in the history

  6. Fix orphans space wrongly showing DMs

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    7c5f04f View commit details
    Browse the repository at this point in the history

  7. Fix tests not accounting for labs

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    19e1b9a View commit details
    Browse the repository at this point in the history

  8. Tweak copy

    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    2c13035 View commit details
    Browse the repository at this point in the history

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

    … t3chguy/fix/19529
    @t3chguy
    t3chguy committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    b251495 View commit details
    Browse the repository at this point in the history