matrix-org/matrix-react-sdk

Pull Requests Commits

Convert multiinvitedialog to use multiinviter

dbkr committed 9 years ago

df925ce5

Merge pull request #464 from remram44/remove-mdown-breaks

ara4n committed 9 years ago

c8def540

Merge pull request #465 from matrix-org/dbkr/fix_unset_dm

ara4n committed 9 years ago

ed2595e3

Fix un-marking rooms as DM rooms

dbkr committed 9 years ago

d19686b9

add missing dialog

ara4n committed 9 years ago

ce40fa1a

dedicated dialog box for E2E messages

ara4n committed 9 years ago

9b7ab46a

Disable markdown line breaks

remram44 committed 9 years ago

8cab40d9

add an onclick to the e2e icons

ara4n committed 9 years ago

5a548c3d

Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms

dbkr committed 9 years ago

e49547eb

Merge pull request #458 from matrix-org/dbkr/createdoom_dm

dbkr committed 9 years ago

f6478f11

fix NPE in EventTile

ara4n committed 9 years ago

13eed6cd

Merge pull request #462 from matrix-org/matthew/e2e

ara4n committed 9 years ago

97976939

ara4n committed 9 years ago

92b41071

final e2e icons

ara4n committed 9 years ago

9eae1c5b

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

dbkr committed 9 years ago

937e1951

Merge branch 'develop' into matthew/e2e

ara4n committed 9 years ago

fb639da1

unbreak video thumbs

ara4n committed 9 years ago

90fea6c3

unbreak video thumbs

ara4n committed 9 years ago

8e7b1820

Don't re-use parted rooms for DMs

dbkr committed 9 years ago

6ffa7c23

Merge pull request #450 from matrix-org/matthew/notif-panel

ara4n committed 9 years ago

3fc657bc

e2e look & feel

ara4n committed 9 years ago

3a1159ce

bring back small avatars for info msgs otherwise the design breaks

ara4n committed 9 years ago

e6b4b8c1

back out small avatars for emotes for now as they conflict with the E2E artwork.

ara4n committed 9 years ago

46205ad8

Merge branch 'develop' into matthew/notif-panel

ara4n committed 9 years ago

83209197

layout for file & notif panel

ara4n committed 9 years ago

34bb37aa

show badge menu on RoomTile hoverover

ara4n committed 9 years ago

bae6409e

use new onRoomTimelineReset API to let notif timeline reset itself

ara4n committed 9 years ago

be33c358

ara4n committed 9 years ago

6f270fd6

Merge pull request #459 from VShell/fix-cas

ara4n committed 9 years ago

86da0e0d

Fix CAS support by using a temporary Matrix client

VShell committed 9 years ago

1380bf70

Older