matrix-org/matrix-react-sdk

Pull Requests Commits

Merge pull request #3128 from matrix-org/bwindels/edit-nested-lists

bwindels committed 6 years ago

Verified 701e18d5

Remove redundant extra chevrons from ContextualMenu

jryans committed 6 years ago

b5598df3

take list nesting into account for indenting

bwindels committed 6 years ago

503d702f

caretNode is a better className

bwindels committed 6 years ago

da766b8c

use BOM marker instead of ZWS

bwindels committed 6 years ago

c5c987f6

Merge pull request #3127 from matrix-org/t3chguy/file_upload_filesize

jryans committed 6 years ago

Verified d3b55241

Add file size to UploadConfirmDialog

t3chguy committed 6 years ago

dea412c9

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

turt2live committed 6 years ago

Verified 2a0660c5

Move early-cancel stuff to constructor

turt2live committed 6 years ago

0f8dd102

Merge pull request #3124 from matrix-org/travis/sas-ok

turt2live committed 6 years ago

Verified 55eec807

put zero-width spaces in caret nodes so chrome doesn't ignore them

bwindels committed 6 years ago

366a4aa3

Merge pull request #3125 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk

dbkr committed 6 years ago

Verified 796a8a18

Translated using Weblate (Italian)

random committed 6 years ago

a03a2d5b

Translated using Weblate (Esperanto)

Tirifto committed 6 years ago

a39420f7

Translated using Weblate (Chinese (Traditional))

s8321414 committed 6 years ago

cbce3736

Translated using Weblate (Bulgarian)

spantaleev committed 6 years ago

1d4089dd

Make the verification cancelled dialog say OK instead of Cancel

turt2live committed 6 years ago

bf443149

Consider cancelled verifications when mounting IncomingSasDialog

turt2live committed 6 years ago

ff3c52a7

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

a14505fe

Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu

jryans committed 6 years ago

Verified b16a3c53

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

c8ae58e0

Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button

jryans committed 6 years ago

Verified 78b0f61e

insert manually, as insertHTML command moves caret inconsistently

bwindels committed 6 years ago

b16bc017

remove special casing for moving caret after newline and pills

bwindels committed 6 years ago

f0271b59

use caret nodes in caret positioning code, to move caret out of pills

bwindels committed 6 years ago

a2296419

also process first part when processing empty and mergeable parts

bwindels committed 6 years ago

607fc328

insert "caret nodes" where pills don't have an adjacent text node

bwindels committed 6 years ago

75fc7697

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

1af4587a

Translated using Weblate (Finnish)

tjhietala committed 6 years ago

dc947ab2

Merge branch 'master' into develop

RiotRobot committed 6 years ago

e675244d

Newer Older