matrix-org/matrix-react-sdk

Pull Requests Commits

Refactor a little

dbkr committed 9 years ago

030d1d05

Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user

richvdh committed 9 years ago

31e09e61

Merge pull request #437 from matrix-org/kegan/starter-links

kegsay committed 9 years ago

6e2fd857

Use href='#' hack to make link text look like a link

kegsay committed 9 years ago

56ac0004

Merge pull request #442 from matrix-org/rav/e2e_devices

richvdh committed 9 years ago

922fb448

Make MemberInfo to use client.getStoredDevicesForUser

richvdh committed 9 years ago

fc40bdcb

Convert MemberDeviceInfo to ES6 class

richvdh committed 9 years ago

a316c652

Merge pull request #439 from matrix-org/rav/enable_megolm_encryption

richvdh committed 9 years ago

941dcc7e

Make the 'encrypt this room' knob be megolm

richvdh committed 9 years ago

bc8e7724

let users join confs as voice or video

ara4n committed 9 years ago

fdfd6ecf

improve e2e warning a bit

ara4n committed 9 years ago

dbd17ea9

Merge branch 'master' into develop

ara4n committed 9 years ago

b5f9c2a5

ara4n committed 9 years ago

14227b57

Prepare changelog for v0.6.5-r3

ara4n committed 9 years ago

714060ec

gah, revert debug

ara4n committed 9 years ago

d5062f1f

Merge branch 'master' into develop

ara4n committed 9 years ago

fd664e89

ara4n committed 9 years ago

c2ca2610

update changelog

ara4n committed 9 years ago

6de2e8bd

Show something when we see a no-op join event

richvdh committed 9 years ago

fd0ed4a4

Merge pull request #438 from matrix-org/rav/matrix_dev_hack

ara4n committed 9 years ago

8e9c04e1

Show something when we see a no-op join event

richvdh committed 9 years ago

f5fe4b24

Implement starter link support

kegsay committed 9 years ago

45ada188

Move scalar auth stuff to ScalarAuthClient from RoomSettings

kegsay committed 9 years ago

6ec7e5df

let you join confs either as voice or video

ara4n committed 9 years ago

f9d8829b

Merge pull request #436 from matrix-org/rav/handle_broken_olm

richvdh committed 9 years ago

d3bc2b7d

Handle broken OlmAccounts

richvdh committed 9 years ago

f3a1c58f

Merge branch 'rav/show_session_load_errors' into develop

richvdh committed 9 years ago

584c7ed5

review feedback

richvdh committed 9 years ago

b4521bc4

Merge branch 'master' into develop

ara4n committed 9 years ago

1a4e236a

ara4n committed 9 years ago

b9d98f91

Older