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

Show rooms in common with another user #4897

Closed
wants to merge 28 commits into from
Closed

Show rooms in common with another user #4897

wants to merge 28 commits into from

Commits on Jul 5, 2020

  1. Show rooms in common with another user

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    354089b View commit details
    Browse the repository at this point in the history

  2. Fix lint

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    e901aae View commit details
    Browse the repository at this point in the history

  3. Add strings

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    d06b90b View commit details
    Browse the repository at this point in the history

  4. Add "compact" view for SharedRooms view

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    f6d2e49 View commit details
    Browse the repository at this point in the history

  5. Show shared rooms to users when being invited

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    9aed1c0 View commit details
    Browse the repository at this point in the history

  6. Lint

    @Half-Shot
    Half-Shot committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    db2b642 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. Typescriptify RoomListSorter

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    e6d2c89 View commit details
    Browse the repository at this point in the history

  2. Order by activity

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    29ce381 View commit details
    Browse the repository at this point in the history

  3. Limit to 3 rooms, but allow expansion

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    23fe7d0 View commit details
    Browse the repository at this point in the history

  4. Fix lint

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    a617eb5 View commit details
    Browse the repository at this point in the history

  5. Show count more

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    a3a9f19 View commit details
    Browse the repository at this point in the history

  6. Update if a new user is selected

    @Half-Shot
    Half-Shot committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    81c68aa View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Merge remote-tracking branch 'origin/develop' into hs/shared-rooms

    @Half-Shot
    Half-Shot committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    b3a7215 View commit details
    Browse the repository at this point in the history

  2. Add UserInfoRoomTile

    @Half-Shot
    Half-Shot committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    169a66c View commit details
    Browse the repository at this point in the history

  3. Refactor to work with new room tiles

    @Half-Shot
    Half-Shot committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    f9cfa60 View commit details
    Browse the repository at this point in the history

  4. Fix builds

    @Half-Shot
    Half-Shot committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    5473f63 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Fix feature code 

    Co-authored-by: Tulir Asokan <tulir@maunium.net>
    @Half-Shot @tulir
    Half-Shot and tulir authored Aug 20, 2020
    Configuration menu
    Copy the full SHA
    f73f937 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2020

  1. Merge branch 'develop' into hs/shared-rooms

    @Half-Shot
    Half-Shot authored Sep 7, 2020
    Configuration menu
    Copy the full SHA
    76ab806 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Apply suggestions from code review 

    begone fragment!

Co-authored-by: Resynth <resynth1943@tutanota.com>
    @Half-Shot @resynth1943
    Half-Shot and resynth1943 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    30384ac View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. Merge remote-tracking branch 'origin/develop' into hs/shared-rooms

    @Half-Shot
    Half-Shot committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    7c828f4 View commit details
    Browse the repository at this point in the history

  2. Drop roomIds state

    @Half-Shot
    Half-Shot committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    f57dca7 View commit details
    Browse the repository at this point in the history

  3. Tweaks

    @Half-Shot
    Half-Shot committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    ba7ccbf View commit details
    Browse the repository at this point in the history

  4. Linting

    @Half-Shot
    Half-Shot committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    51a4371 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Merge remote-tracking branch 'origin/develop' into hs/shared-rooms

    @Half-Shot
    Half-Shot committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    b2a188f View commit details
    Browse the repository at this point in the history

  2. Initial stab at rendering shared rooms in the side panel

    @Half-Shot
    Half-Shot committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    deafdb8 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

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

    … hs/shared-rooms

� Conflicts:
�	src/components/structures/RightPanel.tsx
�	src/components/views/right_panel/UserInfo.tsx
�	src/components/views/rooms/RoomPreviewBar.js
�	src/settings/Settings.tsx
�	src/stores/RightPanelStorePhases.ts
    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    fbcaaab View commit details
    Browse the repository at this point in the history

  2. Iterate PR

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

  3. Iterate PR some more

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