Commit Graph

5 Commits (develop)

Author SHA1 Message Date
Michael Telatynski f0ee7f7905
Merge matrix-react-sdk into element-web
Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-15 15:32:09 +01:00
David Langley 69c28ad74f Update license files 2024-09-06 15:44:31 +01:00
Richard van der Hoff 258fc405db
Update tests not to mock out an ancient server (#26796)
The loading test, which mocks a `/versions` response, currently mocks the
response of a 2-year-old server. This will soon be incompatible with the
JS-SDK. Update the test in preparation.
2024-01-02 11:14:57 +00:00
Dominik Henneke 0040181489
Correctly fill window.matrixChat even when a Wrapper module is active (#26395)
Signed-off-by: Dominik Henneke <dominik.henneke@nordeck.net>
2023-10-18 21:13:30 -04:00
maheichyk 3fd6b62254
Add support for rendering a custom wrapper around Element (#25537)
Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
2023-08-30 07:52:41 +01:00