Merge develop into experimental #815
jryans
merged
28 commits into
experimental
from
develop
Fix typo around getThirdpartyLocation
9a53fa38
Add getThirdpartyUser
81de2b3a
emit oldEventId on "updatePendingEvent"
9cdcbf6b
take into account homoglyphs when calculating similar display names
b34716f7
Support reading custom status messages
848e6e58
Support setting status message in rooms that look like 1:1s
fb65c7f4
Prefix the status message API with `_unstable`
08b3dfa3
Update jsdoc to match _unstable_ prefix
06bc6e75
Merge pull request #805 from matrix-org/travis/custom-status
f53e3372
Reorganize key backup flow
66cdb62a
Add await to ensure we wait for backup errors
c5f6f87a
Emit for key backup failures
2b734b8e
Merge pull request #589 from johbo/add-thirdparty-user
26893b98
Merge pull request #646 from leonlianght/develop
3c1e9ba6
Merge branch 'develop' into t3chguy/unhomoglyph
383f3f98
Merge pull request #809 from jryans/key-backup-version-change
c48a6c06
Pin to base-x 3.0.4
c92e510a
Merge branches 'develop' and 't3chguy/unhomoglyph' of github.com:matr…
790d1dd8
Include unhomoglyph in package-lock.json - it must have felt left out :L
a07f0631
Merge pull request #672 from matrix-org/t3chguy/unhomoglyph
11d40e9d
Add a getAllEndToEndSessions to crypto store
e628ed3e
Missing bracket
59ae6e3d
Note that rebase lets you mass signoff commits
79e155ac
Merge pull request #814 from trashhalo/rebase-tip
6a98e938
Merge pull request #814 from trashhalo/rebase-tip
fb756208
re-add empty check after removing hidden chars
fc5f3c2f
Merge pull request #668 from matrix-org/t3chguy/fix_displayname_logic
472d8faa
Merge pull request #812 from matrix-org/dbkr/getallsessions
f6c8687d
turt2live
approved these changes
on 2019-01-03
Login to write a write a comment.
Login via GitHub