matrix-org/matrix-react-sdk

Pull Requests Commits

Merge pull request #3263 from matrix-org/t3chguy/prop-types

t3chguy committed 6 years ago

Verified 4694a9bf

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

29bc73ef

Merge pull request #3264 from matrix-org/bwindels/diff-visuals

bwindels committed 6 years ago

Verified 85076e4e

strikethrough & underline deletions & insertions

bwindels committed 6 years ago

c093b6ed

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

1564e31d

Translated using Weblate (Azerbaijani)

ferhad.necef committed 6 years ago

73bb9c8b

Merge pull request #3261 from matrix-org/bwindels/edithistorywarning

bwindels committed 6 years ago

Verified 3e07d299

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

t3chguy committed 6 years ago

201d7fb4

Replace React.PropTypes with usage of the `prop-types` package

t3chguy committed 6 years ago

1087e04b

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

7ed9de9b

Merge pull request #3262 from matrix-org/bwindels/fixhtmldiffs

bwindels committed 6 years ago

Verified 678c9a72

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

0e604eff

Translated using Weblate (Dutch)

hieronymousch committed 6 years ago

307af7aa

Translated using Weblate (Basque)

osoitz committed 6 years ago

24122776

Merge pull request #3260 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms

jryans committed 6 years ago

Verified fb77802d

workaround diff-dom returning redundant diff actions

bwindels committed 6 years ago

95f9e48f

Add `room` context to test

jryans committed 6 years ago

c338f8bf

Fix context when using subtree of components

jryans committed 6 years ago

ddf558b3

this is optional, and not provided for first edit

bwindels committed 6 years ago

17e838e2

Introduce RoomContext for sharing state between RoomView and children

t3chguy committed 6 years ago

4517fea4

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

d554556c

Merge pull request #3259 from matrix-org/jryans/anxious

jryans committed 6 years ago

Verified 06bb18bd

Upgrade emojibase to fix :anxious:

jryans committed 6 years ago

8304522b

Merge branch 'origin/develop' into Weblate.

Weblate committed 6 years ago

9ffbbd1f

Merge pull request #3256 from matrix-org/jryans/is-v2-auth

jryans committed 6 years ago

Verified a9a33f5d

Add note to log out from IS

jryans committed 6 years ago

92dbb583

Add note to test tokens

jryans committed 6 years ago

edcdac46

Note cleanup issue

jryans committed 6 years ago

15243ec2

Display lookup errors in the UI

jryans committed 6 years ago

5bb68b4b

Extend comment about checking tokens

jryans committed 6 years ago

55780f3c

Newer Older