matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into matthew/notif-panel

ara4n committed 10 years ago

83209197

layout for file & notif panel

ara4n committed 10 years ago

34bb37aa

show badge menu on RoomTile hoverover

ara4n committed 10 years ago

bae6409e

use new onRoomTimelineReset API to let notif timeline reset itself

ara4n committed 10 years ago

be33c358

ara4n committed 10 years ago

6f270fd6

Merge pull request #459 from VShell/fix-cas

ara4n committed 10 years ago

86da0e0d

Fix CAS support by using a temporary Matrix client

VShell committed 10 years ago

1380bf70

Merge pull request #457 from matrix-org/dbkr/dont_crash_if_no_dm_rooms

ara4n committed 10 years ago

8160613e

Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms

dbkr committed 10 years ago

8e518af9

Don't crash if no DM rooms with someone

dbkr committed 10 years ago

f1ed7502

Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section

dbkr committed 10 years ago

9cff4d59

Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms

dbkr committed 10 years ago

78f53bd4

Don't always show DM rooms in Direct Messages

dbkr committed 10 years ago

4c5db7cc

Merge pull request #452 from aviraldg/test-rte

ara4n committed 10 years ago

fed3f482

Make rooms in MemberInfo update when necessary

dbkr committed 10 years ago

6f2e0a4c

Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms

dbkr committed 10 years ago

590d6d3e

Merge pull request #454 from matrix-org/kegan/get-room-on-first-load

kegsay committed 10 years ago

2078f81f

List common rooms in MemberInfo

dbkr committed 10 years ago

aa0f15c4

Return after sending an error

kegsay committed 10 years ago

9c290c4b

Fix bug whereby refreshing Vector would not allow querying of membership state

kegsay committed 10 years ago

a306a5e6

Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators

ara4n committed 10 years ago

4de0e19e

Should supply the roomId

wmwragg committed 10 years ago

a6b0a7d5

Added the little green men for direct message rooms

wmwragg committed 10 years ago

17b75a58

Merge pull request #451 from matrix-org/rav/deviceinfo

richvdh committed 10 years ago

17e763e8

Add some tests for the rich text editor

aviraldg committed 10 years ago

fec1e4d4

Update MemberDeviceInfo display

richvdh committed 10 years ago

b724b0c6

Merge branch 'develop' into matthew/notif-panel

ara4n committed 10 years ago

904348e6

Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat

ara4n committed 10 years ago

dce2dd36

Merge pull request #443 from matrix-org/luke/post-messages

lukebarnard1 committed 10 years ago

6ddc31fb

Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters

wmwragg committed 10 years ago

840bfe84

Older