matrix-org/matrix-react-sdk

Pull Requests Commits

bwindels committed 5 years ago

f8c6097c

ensure local state for aliases doesn't get garbled up

bwindels committed 5 years ago

7b1b4cda

Reset matrix-js-sdk back to develop branch

RiotRobot committed 5 years ago

b09c063d

Merge branch 'master' into develop

RiotRobot committed 5 years ago

8e8723bb

Merge branch 'release-v2.2.3'

RiotRobot committed 5 years ago

a92fe9f8

RiotRobot committed 5 years ago

1e3b917a

Prepare changelog for v2.2.3

RiotRobot committed 5 years ago

5b96408b

Upgrade matrix-js-sdk to 5.1.1

RiotRobot committed 5 years ago

83b61556

Merge pull request #4228 from matrix-org/jryans/hide-video-config-release

jryans committed 5 years ago

Verified 6e904987

Merge pull request #4227 from matrix-org/jryans/hide-video-config

jryans committed 5 years ago

Verified 93b8dee3

Add default on config setting to control call button in composer

jryans committed 5 years ago

ec4e81de

Add default on config setting to control call button in composer

jryans committed 5 years ago

59b1cbd4

Merge pull request #4221 from matrix-org/bwindels/aliaslipstick

bwindels committed 5 years ago

Verified e8c77543

Merge pull request #4226 from matrix-org/bwindels/aliaslipstick-release

jryans committed 5 years ago

Verified e400950a

bwindels committed 5 years ago

663ccb77

Update src/components/views/room_settings/AliasSettings.js

bwindels committed 5 years ago

26f2bcd0

bwindels committed 5 years ago

048d3f0e

more margin between published and local addresses

bwindels committed 5 years ago

dd19f279

tweak labels, etc

bwindels committed 5 years ago

a591e501

change <details> appearance for local aliases

bwindels committed 5 years ago

5537e6dc

make editable list look like something closer to design

bwindels committed 5 years ago

42ff9f2c

avoid double margin-right for toggle

bwindels committed 5 years ago

cb271fe0

add headers and copy to lessen confusion of new alias workings

bwindels committed 5 years ago

76b7194a

move room publish toggle below canonical alias

bwindels committed 5 years ago

57b2dd92

bwindels committed 5 years ago

01066124

Update src/components/views/room_settings/AliasSettings.js

bwindels committed 5 years ago

Verified 1f4e9288

Merge pull request #4222 from matrix-org/dbkr/wait_for_verify

dbkr committed 5 years ago

Verified 5de93d0f

Merge branch 'poljar/shutdown' into develop

poljar committed 5 years ago

997a179e

Merge branch 'poljar/delete-events' into develop

poljar committed 5 years ago

029624cb

dbkr committed 5 years ago

6c8bfe32

Older