matrix-org/matrix-react-sdk

Pull Requests Commits

Merge pull request #425 from matrix-org/markjh/travis

NegativeMjark committed 9 years ago

fb4d3a97

Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation

ara4n committed 9 years ago

08c0d7e2

Added event/info message avatars back in

wmwragg committed 9 years ago

ae8234ff

Add .travis.yml

NegativeMjark committed 9 years ago

763d3bf9

Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api

kegsay committed 9 years ago

c10208a2

Merge pull request #424 from matrix-org/rav/fix_react_test

richvdh committed 9 years ago

0dbc3ce3

kegsay committed 9 years ago

ecc7850e

Consistency with sendResponse

kegsay committed 9 years ago

1c649303

Review comments

kegsay committed 9 years ago

e96a4000

Fix TimelinePanel test

richvdh committed 9 years ago

70c0290a

Spaces not tabs

kegsay committed 9 years ago

f6b00835

Merge branch 'develop' into wmwragg/direct-chat-sublist

wmwragg committed 9 years ago

6a4d02ff

Added updating of count when room tile notification state changed

wmwragg committed 9 years ago

c362d4ff

Merge pull request #422 from matrix-org/wmwragg/chat-message-presentation

ara4n committed 9 years ago

1a2475eb

Add postMessage API required for integration provisioning

kegsay committed 9 years ago

9162a0ff

Merge branch 'develop' into wmwragg/direct-chat-sublist

wmwragg committed 9 years ago

6d1f9003

Cleanup autocomplete

aviraldg committed 9 years ago

884abbd7

Moving the drirect messages above rooms

wmwragg committed 9 years ago

edb7301b

Merge branch 'develop' into wmwragg/chat-message-presentation

wmwragg committed 9 years ago

48a2567b

Removal of the mini avatars for action (info) messages

wmwragg committed 9 years ago

99333349

Comment to describe what info messages are

wmwragg committed 9 years ago

afd1ab15

Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not

wmwragg committed 9 years ago

ddda435e

Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message

wmwragg committed 9 years ago

a55c4a2a

Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages

dbkr committed 9 years ago

d23ed642

Only try to delete room rule if it exists

dbkr committed 9 years ago

5495cfac

Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work

richvdh committed 9 years ago

e29be619

Comment override rule stuff

dbkr committed 9 years ago

d08f7166

We can use the new consts here

dbkr committed 9 years ago

fc2c62e8

Oops, missed a constant

dbkr committed 9 years ago

bab2f23d

Various PR feedback

dbkr committed 9 years ago

af48b892

Newer Older