matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into luke/add-onclick-permalinks

lukebarnard1 committed 9 years ago

c98a2144

Luke Barnard committed 9 years ago

173daddb

Merge pull request #739 from matrix-org/luke/visible-redactions

dbkr committed 9 years ago

676c5c21

Add onClick to permalinks to route within Riot

Luke Barnard committed 9 years ago

2513bfa6

Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog

lukebarnard1 committed 9 years ago

b7f1b1a4

Merge pull request #741 from matrix-org/dbkr/fix_teamserver_2

dbkr committed 9 years ago

65ce8c21

Merge pull request #740 from matrix-org/luke/clarify-no-devices

dbkr committed 9 years ago

87a5db65

Remove dis as a dep in RoomTile

Luke Barnard committed 9 years ago

391886ca

Instead of listening for view_room, use a callback

Luke Barnard committed 9 years ago

bf348a0f

Fix the team server registration

dbkr committed 9 years ago

341f9787

Clarify "No devices" message

Luke Barnard committed 9 years ago

04510da0

Remember to unregister on unmoun

Luke Barnard committed 9 years ago

20fa3632

Use dispatch instead of passing `onClick`, adjust dialog wording.

Luke Barnard committed 9 years ago

4548d1b8

Luke Barnard committed 9 years ago

a122b5d8

Make redactions appear when the event has been redacted (on Room.redaction)

Luke Barnard committed 9 years ago

c0fc3ba3

Merge pull request #735 from matrix-org/luke/matrix-to-timestamp-permalink

dbkr committed 9 years ago

49c66d86

Merge pull request #734 from matrix-org/luke/fix-resend

dbkr committed 9 years ago

30eddf9f

No text required, do not continuate after redacted even

Luke Barnard committed 9 years ago

edccfeb2

No need for "redactor" as we dont currently show it

Luke Barnard committed 9 years ago

abd71cd2

Merge pull request #737 from matrix-org/luke/fix-color-regex-strictness

lukebarnard1 committed 9 years ago

9f6a5d11

Add the redacter display name to the redaction text

Luke Barnard committed 9 years ago

9bae9368

Only show a redaction tile for messages

Luke Barnard committed 9 years ago

5ef61b7c

Remove seemingly unused "bounce"

Luke Barnard committed 9 years ago

6c32e372

Make COLOR_REGEX stricter

Luke Barnard committed 9 years ago

fa2cf410

Start to show redacted events

Luke Barnard committed 9 years ago

2bd98852

Remove old import & pass through result

dbkr committed 9 years ago

62d94395

Allow user to choose from existing DMs on new chat

Luke Barnard committed 9 years ago

ca5c2fb8

Merge pull request #729 from matrix-org/dbkr/register_ui_auth

dbkr committed 9 years ago

1bdf213d

Make UIAuth Dialog show an error

dbkr committed 9 years ago

977b8a73

Merge pull request #732 from matrix-org/luke/fuse-test

lukebarnard1 committed 9 years ago

ab9aaa91

Older