matrix-org/matrix-react-sdk

Pull Requests Commits

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

t3chguy committed 6 years ago

880e16aa

Fix reacting to redactions

t3chguy committed 6 years ago

fe03d02c

Add missing documentation

turt2live committed 6 years ago

3a3ddbf7

Calculate badges in the new room list more reliably

turt2live committed 6 years ago

a19e27d1

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

e639c547

Translated using Weblate (Lithuanian)

MamasLT committed 6 years ago

efb3dd2e

Translated using Weblate (Galician)

XoseM committed 6 years ago

24c37911

Translated using Weblate (Galician)

XoseM committed 6 years ago

8a1ace43

Merge pull request #4614 from matrix-org/t3chguy/toasts2

t3chguy committed 6 years ago

Verified 696f158b

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

3c781e0e

Reset matrix-js-sdk back to develop branch

RiotRobot committed 6 years ago

af59d3a0

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

568391f6

Merge branch 'master' into develop

RiotRobot committed 6 years ago

5ec84594

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

ec618097

Merge pull request #4619 from matrix-org/t3chguy/tag_dm_regr

t3chguy committed 6 years ago

Verified 50f3e265

RiotRobot committed 6 years ago

5a4da13e

Prepare changelog for v2.6.1

RiotRobot committed 6 years ago

762918d6

Fix: Tag_DM is not defined

t3chguy committed 6 years ago

ac0d7948

Merge pull request #4617 from matrix-org/jryans/release-4612

jryans committed 6 years ago

Verified 1c3c0844

Merge pull request #4616 from matrix-org/jryans/release-4607

jryans committed 6 years ago

Verified 88df8790

Fix key backup restore with SSSS

dbkr committed 6 years ago

02016555

Remove SSSS key upgrade check from rageshake

dbkr committed 6 years ago

badda5ae

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

ba72d5ea

Translated using Weblate (Lithuanian)

MamasLT committed 6 years ago

fe357e53

Translated using Weblate (Italian)

random committed 6 years ago

ead1fc59

Translated using Weblate (Galician)

XoseM committed 6 years ago

f00ce9aa

Translated using Weblate (French)

Kévin C committed 6 years ago

19667964

Translated using Weblate (Estonian)

Priit Jõerüüt committed 6 years ago

f0c8f20c

Translated using Weblate (Esperanto)

Tirifto committed 6 years ago

cb270ba0

Merge pull request #4615 from matrix-org/travis/fix-timestamps

dbkr committed 6 years ago

Verified ac91304d

Newer Older