Merge branch 'develop' into t3chguy/spaces4.9

This commit is contained in:
Michael Telatynski 2021-03-16 11:14:38 +00:00 committed by GitHub
commit 688407abe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
403 changed files with 4997 additions and 1886 deletions

View file

@ -57,6 +57,7 @@ import { ICollapseConfig } from "../../resizer/distributors/collapse";
import HostSignupContainer from '../views/host_signup/HostSignupContainer';
import { IOpts } from "../../createRoom";
import SpacePanel from "../views/spaces/SpacePanel";
import {replaceableComponent} from "../../utils/replaceableComponent";
// We need to fetch each pinned message individually (if we don't already have it)
// so each pinned message may trigger a request. Limit the number per room for sanity.
@ -129,6 +130,7 @@ interface IState {
*
* Components mounted below us can access the matrix client via the react context.
*/
@replaceableComponent("structures.LoggedInView")
class LoggedInView extends React.Component<IProps, IState> {
static displayName = 'LoggedInView';