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

Initial Spaces [MSC1772] support #5508

Closed
wants to merge 108 commits into from
Closed

Initial Spaces [MSC1772] support #5508

wants to merge 108 commits into from

Conversation

@t3chguy
Copy link
Member

@t3chguy t3chguy commented Dec 18, 2020 •
edited
Loading

Split out into
#5704
#5705
#5706

t3chguy and others added 30 commits November 27, 2020 14:31
@t3chguy
Create Labs flag for Matrix Spaces (feature_spaces)
fd202d0
@t3chguy
Break out generic Room name and topic components which self maintain
715cbbe
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
7e40af1 
… t3chguy/spaces

� Conflicts:
�	src/i18n/strings/en_EN.json
�	src/settings/Settings.ts
@t3chguy
Merge branch 't3chguy/fix/15905' of github.com:matrix-org/matrix-reac…
12f125a 
…t-sdk into t3chguy/spaces
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
124393c 
… t3chguy/spaces
@t3chguy
Fix RoomName and RoomTopic HOCs edge case when room prop changes
8ee88a8
@t3chguy
Fix room-list algorithm behaviour on space-rooms and improve edge-cas…
355c19c 
…e error
@t3chguy
Ignore space-rooms as breadcrumbs
db35595
@t3chguy
Use new Room::canInvite method to prevent duplicating code
3c16d4a
@t3chguy
Wire up RoomView prop justCreated for being able to distinguish pos…
4484e16 
…t-creation CTAs
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
4fd1795 
… t3chguy/spaces
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
28db650 
… t3chguy/spaces
@t3chguy
Extend ContextMenu with wrapperClassName prop
842cf87
@t3chguy
Fix RoomAvatar typescript props definition
ef524e9
@t3chguy
Avatar don't check Spaces for DM-ness
ee69d71
@t3chguy
Permalinks expose serverCandidates for re-use
110745f
@t3chguy
Room List algorithm - sanely handle space invites
7454858
@t3chguy
Add useStateArray hook
7f41735
@t3chguy
Extend permalink utility for calculating room vias
5703854
@t3chguy
Add setHasDiff utility
55689e2
@t3chguy
RoomListStore pass filtered lists to ListNotificationStates
41ac8da
@t3chguy
Fix invite.svg alignment issue
13a283e
@t3chguy
Iterate UserMenu styling, padding, and add an Avatar to it
c16a7cf
@t3chguy
Create space variants of some right panel cards and decorate them wit…
7eb27eb 
…h the space name & avatar
@t3chguy
stash work so far
2c0d831
@bwindels
WIP of space tree
cf30345
@bwindels
allow selecting sub spaces
d388663
@bwindels
fix react error
a912a21
@bwindels
adjust left panel css to allow variable width space panel
f63c986
@bwindels
make space panel variable width
f94f99e 
with a max-width on the space name of 150px
@t3chguy t3chguy changed the base branch from develop to spaces_feature February 4, 2021 13:30
@t3chguy t3chguy marked this pull request as ready for review February 4, 2021 13:30
@t3chguy t3chguy marked this pull request as draft February 4, 2021 13:30
@t3chguy t3chguy changed the base branch from spaces_feature to develop February 4, 2021 13:31
@t3chguy
Update some colours, icons and copy
2b8cb32
@t3chguy
Fix default avatar colours being generated wrong in space room directory
9110423
@t3chguy
Sort space children as per the MSC
3a74bd3
@t3chguy
Don't show un-joined spaces in the hierarchy
ebba925
@t3chguy
Wire up Space Room Directory admin mode
e0dca6c
@t3chguy
delint
5ffc110
@t3chguy
Iterate space room directory
112e282
@t3chguy
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
54f4c0e 
… t3chguy/spaces

� Conflicts:
�	src/@types/global.d.ts
�	src/components/structures/LoggedInView.tsx
�	src/components/structures/UserMenu.tsx
�	src/components/views/right_panel/UserInfo.tsx
�	src/createRoom.ts
�	src/dispatcher/actions.ts
�	src/i18n/strings/en_EN.json
�	src/settings/Settings.ts
@t3chguy
i18n
ad5d8b0
This was referenced Feb 18, 2021
Merged
Merged
@t3chguy
Copy link
Member Author

t3chguy commented Mar 2, 2021

Split out into
#5704
#5705
#5706

@t3chguy t3chguy closed this Mar 2, 2021
@t3chguy t3chguy deleted the t3chguy/spaces branch March 2, 2021 15:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@t3chguy @bwindels