t3chguy/matrix-js-sdk

Pull Requests Commits

Merge pull request #960 from matrix-org/bwindels/redactions-blended-echo

bwindels committed 6 years ago

Verified e2e034f7

remove redundant localecho part from method name

bwindels committed 6 years ago

bb5e3d51

bwindels committed 6 years ago

70b23614

return 'sending' status for an event that is only locally redacted

bwindels committed 6 years ago

24a75e37

Merge pull request #954 from uhoreg/fix_verification_request

uhoreg committed 6 years ago

Verified d694ee3e

Merge pull request #956 from matrix-org/dbkr/resurrect_riot_bot

dbkr committed 6 years ago

Verified efbdf4e1

Add flag to force saving sync store

dbkr committed 6 years ago

44bfc2e8

welcome back, Olm

turt2live committed 6 years ago

Verified 0121bdbb

Merge pull request #953 from matrix-org/dbkr/simplify_email_reg

dbkr committed 6 years ago

Verified b8ba77a7

use right variable

dbkr committed 6 years ago

65dd5cc6

Expose the inhibit_login flag to register

dbkr committed 6 years ago

8aeb9948

Key verification request fixes

uhoreg committed 6 years ago

64daa444

Merge pull request #947 from matrix-org/bwindels/relations-unsent

bwindels committed 6 years ago

Verified 26aab4f3

move CANCELLED check deeper into aggregation path

bwindels committed 6 years ago

6059df1b

add hasAssociation helper

bwindels committed 6 years ago

2a0c85c7

expand comment why need to preserve redaction local echo on remote echo

bwindels committed 6 years ago

3488fbe6

whitespace, newlines

bwindels committed 6 years ago

811a98ad

add isRedaction helper on Event

bwindels committed 6 years ago

4462f4b9

rename related id to associated id

bwindels committed 6 years ago

4143a79f

clarify why we need to listen for remote echo of related event

bwindels committed 6 years ago

3ed9b003

bwindels committed 6 years ago

b005b753

bwindels committed 6 years ago

a9f9e2cf

make sure where not re-adding cancelled events when undoing local red.

bwindels committed 6 years ago

5602b94d

don't add events from /sync that have been locally redacted

bwindels committed 6 years ago

930de640

preserve (locally) redacted state after applying remote echo

bwindels committed 6 years ago

6d9fba81

get the txnId from the correct place to delete event after remote echo

bwindels committed 6 years ago

624c6f0a

bwindels committed 6 years ago

7d2f7fae

bwindels committed 6 years ago

3f917b39

rename target id to related id and add jsdoc comments

bwindels committed 6 years ago

f1336a5c

emit Relations.redaction synchronously, timeout should not be needed

bwindels committed 6 years ago

7a10d504

Newer Older