t3chguy/matrix-js-sdk

Pull Requests Commits

Merge pull request #961 from matrix-org/travis/sas-timeouts

turt2live committed 6 years ago

Verified aef7b9a1

Appease the linter

turt2live committed 6 years ago

7cb8de5b

Null check and naming

turt2live committed 6 years ago

5c2fb1c4

Merge pull request #962 from matrix-org/travis/sas-cancel

turt2live committed 6 years ago

Verified 55385758

Don't handle key verification requests which are immediately cancelled

turt2live committed 6 years ago

6d092315

Don't timeout cancelled requests

turt2live committed 6 years ago

e34eb489

Time out verification attempts after 10 minutes of inactivity

turt2live committed 6 years ago

05ab6ef3

RiotRobot committed 6 years ago

81eefc13

Prepare changelog for v2.0.1

RiotRobot committed 6 years ago

895d854e

RiotRobot committed 6 years ago

e432d4f8

Prepare changelog for v2.0.1-rc.2

RiotRobot committed 6 years ago

56c0ae29

Merge remote-tracking branch 'origin/develop' into release-v2.0.1

dbkr committed 6 years ago

0b9d68b4

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

Newer Older