matrix-org/matrix-react-sdk

Pull Requests Commits

Revert "also enable 4s when accepting a verification request"

bwindels committed 6 years ago

13a4f419

Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent

bwindels committed 6 years ago

Verified 1ae4a1cd

Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise

bwindels committed 6 years ago

Verified 27db5d68

Merge pull request #4194 from matrix-org/bwindels/enable4sonverify

bwindels committed 6 years ago

Verified f22554e9

also allow passing a promise to a verif request to the verification dialog

bwindels committed 6 years ago

91de7fd7

add fallback label for canonical alias events that dont change anything

bwindels committed 6 years ago

5d7f2f96

use USK as we'll only have that around when using key sharing

bwindels committed 6 years ago

1eb5bdf8

Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"

turt2live committed 6 years ago

f33c930c

Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree

turt2live committed 6 years ago

Verified a808b050

move i18n strings around as script desires

bwindels committed 6 years ago

e34a3710

also enable 4s when accepting a verification request

bwindels committed 6 years ago

ab2e3a34

enable 4S if needed when trying to verify

bwindels committed 6 years ago

ddbfe4e1

Merge pull request #4191 from matrix-org/travis/remove-v1-identity

turt2live committed 6 years ago

Verified 9b62cc96

Remove extraneous tab stop from room tree view.

MarcoZehe committed 6 years ago

3bff5c55

Merge pull request #4187 from matrix-org/bwindels/altaliases

bwindels committed 6 years ago

Verified c5e62ec0

Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline

bwindels committed 6 years ago

Verified db9895f2

Merge pull request #4190 from matrix-org/jryans/mark-as-read-dark

jryans committed 6 years ago

Verified b64faad4

Remove v1 identity server fallbacks

turt2live committed 6 years ago

4cdfda3c

Fix mark as read button for dark theme

jryans committed 6 years ago

c541bc07

add timeline text descriptions for modifying alt_aliases

bwindels committed 6 years ago

378939be

remove timeline tiles for m.room.aliases events

bwindels committed 6 years ago

0d8b4ac1

Merge pull request #4188 from matrix-org/dbkr/remove_version_link

dbkr committed 6 years ago

Verified b1ad0b8d

Un-linkify version in settings

dbkr committed 6 years ago

650d3d0e

Merge pull request #4186 from matrix-org/jryans/mjolnir-stop

jryans committed 6 years ago

Verified d2cd64d9

update e2e tests to expand local aliases when adding one

bwindels committed 6 years ago

5eaf03c3

bwindels committed 6 years ago

9961f810

show hand cursor over summary

bwindels committed 6 years ago

8ee714f8

bwindels committed 6 years ago

dcbbf31f

only load local aliases on mount when you can edit the canonical alias

bwindels committed 6 years ago

f7cb633e

make pressing enter not reload riot when editable list is in form

bwindels committed 6 years ago

053ba111

Older