matrix-org/matrix-react-sdk

Pull Requests Commits

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

dbkr committed 8 years ago

9ccda7ed

Merge pull request #764 from lieuwex/fix-extraneous-space-emote

ara4n committed 8 years ago

f65cc940

avoid leading space in HTML /me too

ara4n committed 8 years ago

bf8973ad

fix leading extraneous space in emotes

lieuwex committed 8 years ago

c697b48f

UnknownBody: add explanatory title

aviraldg committed 8 years ago

Verified 7891f9b2

Merge pull request #763 from kfatehi/277-confirmredact

ara4n committed 8 years ago

68f66e94

clarify that redact === delete

ara4n committed 8 years ago

df63c779

Add ConfirmRedactDialog component

kfatehi committed 8 years ago

25a4f4e3

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

dbkr committed 8 years ago

92d5f55a

Merge pull request #760 from matrix-org/dbkr/fix_test_waitforcomponent

dbkr committed 8 years ago

33f5c286

Put back both done's

dbkr committed 8 years ago

23c38bd8

Fix password UI auth test

dbkr committed 8 years ago

375ae8fb

Merge pull request #759 from matrix-org/luke/display-redactions-better

dbkr committed 8 years ago

f8a16347

Display timestamps and profiles for redacted events

Luke Barnard committed 8 years ago

d4ed9e81

Merge pull request #757 from matrix-org/luke/fix-unverified-warning-voip

lukebarnard1 committed 8 years ago

c413de44

Display threepids slightly prettier

dbkr committed 8 years ago

b0611120

Fix UDD for voip in e2e rooms

Luke Barnard committed 8 years ago

3ce0da45

Merge pull request #755 from matrix-org/luke/export-e2e-on-logout

lukebarnard1 committed 8 years ago

e04a368f

Add "Export E2E keys" option to logout dialog

Luke Barnard committed 8 years ago

b21f016d

Merge pull request #754 from matrix-org/luke/fix-room-list-people

dbkr committed 8 years ago

f51a022b

Fix People section a bit

Luke Barnard committed 8 years ago

ed22a74e

Merge pull request #753 from matrix-org/luke/fix-register-not-routing

dbkr committed 8 years ago

648ad8d6

Luke Barnard committed 8 years ago

5330e47b

Do routing to /register _onLoadCompleted

Luke Barnard committed 8 years ago

238e48e4

Merge pull request #747 from matrix-org/luke/increase-scrollback-window

richvdh committed 8 years ago

3325dd6e

Merge pull request #751 from matrix-org/luke/fix-start-login

lukebarnard1 committed 8 years ago

1cb653ac

Add null check to start_login

Luke Barnard committed 8 years ago

47958180

Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus

lukebarnard1 committed 8 years ago

5e93dde0

Merge pull request #748 from matrix-org/luke/logout-after-deactivate

dbkr committed 8 years ago

0e959269

Merge pull request #745 from matrix-org/luke/UDE-file-upload

lukebarnard1 committed 8 years ago

c717dc02

Older