t3chguy/matrix-js-sdk

Pull Requests Commits

Update comment on default override rules

dbkr committed 5 years ago

cf2b058e

Combine the two places we processed client-level default push rules

dbkr committed 5 years ago

d6e37d02

Merge pull request #1241 from matrix-org/t3chguy/fix_unhomoglyph_import

t3chguy committed 5 years ago

Verified bd569cb0

Merge branch 'master' into develop

RiotRobot committed 5 years ago

e3c6a0e1

RiotRobot committed 5 years ago

b2917650

Prepare changelog for v6.1.0

RiotRobot committed 5 years ago

db25e971

t3chguy committed 5 years ago

661901b0

t3chguy committed 5 years ago

b9352cfc

t3chguy committed 5 years ago

e381b190

Add simple browserify sync test

t3chguy committed 5 years ago

f806e434

t3chguy committed 5 years ago

7f32d7d3

Merge branches 'develop' and 't3chguy/fix_unhomoglyph_import' of github.com:matrix-org/matrix-js-sdk into t3chguy/fix_unhomoglyph_import

t3chguy committed 5 years ago

b1b4b21d

Merge pull request #1376 from matrix-org/uhoreg/sas2

uhoreg committed 5 years ago

Verified 486e8b54

support new key agreement method for SAS

uhoreg committed 5 years ago

bdadcd45

RiotRobot committed 5 years ago

1de9a246

Prepare changelog for v6.1.0-rc.1

RiotRobot committed 5 years ago

6335f14a

Merge pull request #1373 from matrix-org/bwindels/remove-asym-4s

bwindels committed 5 years ago

Verified da2ef381

don't sign 4S keys anymore

bwindels committed 5 years ago

7b173f4c

remove upgrade path from asym to sym 4S algorithm

bwindels committed 5 years ago

d49eb0bb

bwindels committed 5 years ago

91556d5b

remove tests for upgrade path

bwindels committed 5 years ago

039abe1f

don't sign/verify 4s key with cross signing master key anymore

bwindels committed 5 years ago

bc32faf4

remove support for asym 4s enc

bwindels committed 5 years ago

74a4dfeb

Merge branch 'master' into develop

RiotRobot committed 5 years ago

f120533f

RiotRobot committed 5 years ago

a1baf392

Prepare changelog for v6.0.0

RiotRobot committed 5 years ago

9f0f1bcc

Merge pull request #1368 from matrix-org/foldleft/13167-spinner-progress-rc

jryans committed 5 years ago

Verified 246963e1

satisfy linter 2, now with more self-hatred

foldleft committed 5 years ago

e3134ab0

satisfy the linter

foldleft committed 5 years ago

b38d52da

foldleft committed 5 years ago

411c4f40

Older