matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into bwindels/selfverifux

bwindels committed 5 years ago

adead768

adjust start options styling

bwindels committed 5 years ago

2cf55fb2

bwindels committed 5 years ago

37289bc8

adjust self-verification copy in incoming verif req toast

bwindels committed 5 years ago

364421b0

adjust copy for self-verification in verification panel

bwindels committed 5 years ago

cdbd4da0

for self-verif, mention which device, not user we're verifying in panel

bwindels committed 5 years ago

030d594e

Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate

bwindels committed 5 years ago

Verified c15fa2ba

Merge pull request #4339 from jungeonkim/develop

bwindels committed 5 years ago

Verified 26987514

Fix Hangul typing does not work properly

jungeonkim committed 5 years ago

94236de6

Merge pull request #4336 from matrix-org/bwindels/fixverifytoastaftercompletesecurity

bwindels committed 5 years ago

Verified 9407df3d

Merge pull request #4340 from matrix-org/jryans/read-marker-groupers

jryans committed 5 years ago

Verified cabaf367

Fix read marker visibility for grouped events

jryans committed 5 years ago

86f39ee0

Merge pull request #4305 from JorikSchellekens/joriks/font-scaling

JorikSchellekens committed 5 years ago

Verified 3ed457ea

pass isSelf flag to sas component

bwindels committed 5 years ago

2ee780ca

adjust sas copy to use device -> session

bwindels committed 5 years ago

6bb68855

adapt encryption info to self-verification

bwindels committed 5 years ago

cc9c5cab

set dialog title for self-verification

bwindels committed 5 years ago

081baa23

Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux

bwindels committed 5 years ago

009941a6

bwindels committed 5 years ago

fffd5a4a

some comments to explain the mess

bwindels committed 5 years ago

1baaafe7

more polish for self-verification

bwindels committed 5 years ago

0307361f

Merge pull request #4337 from matrix-org/dbkr/fix_inhibit_login_case

dbkr committed 5 years ago

Verified 9944ce71

Fix spurious extra devices on registration

dbkr committed 5 years ago

705fd57a

dismiss setup encryption toast if cross-signing is ready

bwindels committed 5 years ago

ee61a3af

Remove sort and include new scss file in components

JorikSchellekens committed 5 years ago

202ad9f9

Change copyright

JorikSchellekens committed 5 years ago

df1a8b28

bwindels committed 5 years ago

31ca52de

polish design and disable buttons after click

bwindels committed 5 years ago

1f65cfb7

fixup: more i18n

bwindels committed 5 years ago

ccf6c9ef

bwindels committed 5 years ago

a4f448d4

Older