Michael Telatynski faa9124f2b Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 ...

 Conflicts:

	src/components/views/rooms/RoomTile2.tsx

2020-07-08 08:57:01 +01:00

..

_AppsDrawer.scss

…

_Autocomplete.scss

…

_AuxPanel.scss

…

_BasicMessageComposer.scss

…

_E2EIcon.scss

…

_EditMessageComposer.scss

…

_EntityTile.scss

…

_EventTile.scss

Merge pull request #4797 from matrix-org/uhoreg/distrust_backup

2020-06-23 15:38:03 -04:00

_GroupLayout.scss

Fix read-receipt alignment

2020-06-10 15:21:36 +01:00

_InviteOnlyIcon.scss

…

_IRCLayout.scss

Fix MessageActionBar

2020-06-22 16:02:23 +01:00

_JumpToBottomButton.scss

…

_LinkPreviewWidget.scss

…

_MemberInfo.scss

…

_MemberList.scss

…

_MessageComposer.scss

…

_MessageComposerFormatBar.scss

…

_NotificationBadge.scss

Add rudimentary dark theme support

2020-06-12 13:52:54 -06:00

_PinnedEventsPanel.scss

…

_PinnedEventTile.scss

…

_PresenceLabel.scss

…

_ReplyPreview.scss

…

_RoomBreadcrumbs2.scss

Add tooltips for breadcrumbs

2020-07-01 12:23:27 +01:00

_RoomBreadcrumbs.scss

…

_RoomDropTarget.scss

…

_RoomHeader.scss

fix requested changes from #3991

2020-06-16 23:11:32 +02:00

_RoomList2.scss

Fix vertical height causing sublists to wrap

2020-06-10 15:22:17 -06:00

_RoomList.scss

…

_RoomPreviewBar.scss

…

_RoomRecoveryReminder.scss

…

_RoomSublist2.scss

Fix gaps

2020-07-08 00:18:58 +01:00

_RoomTile2.scss

Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345

2020-07-07 17:11:04 +01:00

_RoomTile.scss

…

_RoomTileIcon.scss

Add presence icons; Convert to generic icon component

2020-06-16 14:44:37 -06:00

_RoomUpgradeWarningBar.scss

…

_SearchBar.scss

…

_SendMessageComposer.scss

…

_Stickers.scss

…

_TopUnreadMessagesBar.scss

…

_UserOnlineDot.scss

…

_WhoIsTypingTile.scss

…